Browse Source

二次授权

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

+ 18 - 7
component/loginDialog.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<van-dialog  title="请登录"
-		show-cancel-button="true"
+		:show-cancel-button="ishow"
 		:show="show"
 		@cancel="cancelDialog" @confirm="confirmOrder"
 		confirm-button-open-type="getUserInfo"	
@@ -22,7 +22,11 @@
 		  showdialog:{
 		    default: false,
 		    type: Boolean
-		  }
+		  },
+		  ishow:{
+		    default: true,
+		    type: Boolean
+		  },
 		},
 		 data() {
 			return{
@@ -31,22 +35,28 @@
 		},
 		watch:{
 			'showdialog':function(val) {
+				console.log("jinlaile")
+				console.log(val)
 				if(val) {
 					this.show = true;
 				}else {
 					this.show = false;
 				}
+				console.log(this.show);
 			}
 		},
 		methods:{
 			...mapMutations(['login','showDialog']),
 			cancelDialog() {
-				this.$msg('登录失败');
-				this.login();
+				this.show = false;
 				this.$emit('cancelDiaolog')
 				this.showDialog(false);
+				this.login();
+				this.$msg('登录失败');
 			},
 			confirmOrder() {
+				this.show = false;
+				this.$emit('changeDiaolog');
 				this.wxlogion();
 			},
 			wxlogion() {
@@ -54,13 +64,14 @@
 				    uni.getUserInfo({
 					     success(res) {
 							 that.login(res.userInfo);
-							 that.showDialog(true);
+							 that.showDialog(true); // 改变haslogion的值
 							 that.$emit('confirmDiaolog');
 							 that.$msg("登录成功")
 					     },
 					     fail(res) {
-						    console.log(res);
-							that.$msg("登录失败")
+						     that.$emit('keepdialog');  // 订单我的保持登录
+							 that.showDialog(false);
+							 that.$msg("登录失败")
 					     }
 				    })
 			}

+ 32 - 14
component/uploadImage.vue

@@ -4,8 +4,9 @@
 			<view class="uni-uploader-body">
 				<view class="uni-uploader__files">
 					<block v-for="(image,index) in imageList" :key="index">
-						<view class="uni-uploader__file">
-							<image class="uni-uploader__img" :src="image" :data-src="image" @tap="previewImage"></image>
+						<view class="uni-uploader__file" style="position: relative;">
+							<image class="uni-uploader__img" :src="image" :data-src="image" ></image>
+							<view @click="deleteImg(index)" style="position: absolute;right:0;top:0;">X</view>
 						</view>
 					</block>
 					<view v-if="imageList.length != 3" class="uni-uploader__input-box deepHeight">
@@ -22,6 +23,7 @@
 		data(){
 			return{
 				imageList:[],
+				filelist:[],
 				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
 				sourceType: ['album'], //从相册选择
 				countIndex: 1,
@@ -36,13 +38,14 @@
 				this.countIndex = 1;
 		},
 		methods: {
+			deleteImg(e) {
+				let index = e;
+				this.imageList.splice(index,1);
+				this.filelist.splice(index,1);
+				this.$emit("getImg", this.filelist);
+			},
 			chooseImage() {
 				if (this.imageList.length === 3) {
-					// let isContinue = await this.isFullImg();
-					// console.log("是否继续?", isContinue);
-					// if (!isContinue) {
-					// 	return;
-					// }
 					return;
 				}
 				uni.chooseImage({
@@ -50,21 +53,36 @@
 					sizeType: this.sizeType,
 					count: this.imageList.length + this.count[this.countIndex] > 3 ? 3 - this.imageList.length : this.count[this.countIndex],
 					success: (res) => {
+						console.log(res);
+						const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU4OTMzNTEyOCwiZXhwIjoxNTkwMTk5MTI4LCJuYmYiOjE1ODkzMzUxMjgsInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.Uec3pKa_Btj0u_6qR95YK_MzyhL9gEcczRd3FpG9xUg';
 						this.imageList = this.imageList.concat(res.tempFilePaths);
 						        uni.uploadFile({
-						            url: '', 
-						            filePath: tempFilePaths[0],
-						            name: 'file',
-						            formData: {
-						                'user': 'test'
-						            },
+						             url: 'https://www.qzaiwang.com/v2/upload/tmp',
+						             filePath: res.tempFilePaths[0],
+						             name: 'file',
+									 header: {
+									 'X-TOKEN' : token,
+									 },
+						             formData: {
+						                 'user': 'test'
+						             },
 						            success: (uploadFileRes) => {
-						                console.log(uploadFileRes.data);
+										let data = uploadFileRes.data;
+										let newdata = JSON.parse(data);
+										let url = newdata.data.file_name;
+										console.log(url)
+										let array = [];
+										array.push({})
+										array[0] = url;
+										console.log(array);
+										this.filelist = this.filelist.concat(array);
+						                this.$emit("getImg", this.filelist);
 						            }
 						        });
 					}
 				})
 			},
+			
 		}
 	}
 </script>

+ 6 - 6
manifest.json

@@ -55,16 +55,16 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc566017770d22c31",
+        "appid" : "wxb09388c49aeb368c",
         "setting" : {
             "urlCheck" : true
         },
         "usingComponents" : true,
-		   "permission": {
-			 "scope.userLocation": {
-			   "desc": "演示定位能力"
-			 }
-		   }
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "演示定位能力"
+            }
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

+ 16 - 0
pages.json

@@ -102,6 +102,14 @@
 			}
 		},
 		
+		{
+			"path": "pages/myone/onedetail",
+			"style": {
+			}
+		},
+		
+		// onedetail
+		
 		{
 			"path": "pages/myOrder/index",
 			"style": {
@@ -229,6 +237,14 @@
 				 }
 			}
 		},
+		{
+			"path": "pages/myCenter/logion",
+			"style": {
+				"navigationBarTitleText": "登录", 
+				 "usingComponents": {
+				 }
+			}
+		},
 		{
 			"path": "pages/myCenter/business",
 			"style": {

+ 27 - 15
pages/index/hotel.vue

@@ -33,8 +33,9 @@
        
        <view class="tip">
            <view style="font-size: 36upx;color: #303133;">{{hotelitle}}</view>
-           <view @click="gocollect">
-               <uniIcon type="star" size="22" color="#909399"></uniIcon>
+           <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" /> 
            </view>
        </view>
        
@@ -140,6 +141,7 @@
         },
         data() {
             return {
+				has_collected: 0, // 收藏酒店
 				chosegoods_commonid: true,
 				chosegoods_price: true,
 				firstwo: 1,
@@ -222,10 +224,21 @@
 			]),
 		},
         methods: {
+			
 			// 收藏
 			gocollect() {
 				if(this.hasLogin) {
-				 
+				 this.request({
+				 	url: '/v1/favorites/collect',
+				 	method: 'post',
+				 	data: {
+				 		type:'store',
+				 		fav_id: this.goodId
+				 	},
+				 	success: () => {
+				 		this.gethoteil()
+				 	}
+				 })
 				}else {
 					this.showdialog = true;
 				}
@@ -338,7 +351,6 @@
             },
 			// 获取酒店评价
 			getcomment() {
-				let that = this;
 				this.request({
 					url:'/v1/store/feedbackList',
 					method: 'POST',
@@ -347,34 +359,34 @@
 						page_size: 10,
 						store_id: this.goodId
 					},
-					success:function(res) {
-						console.log(res.data.data.feedback_list)
-						that.feedback_list = res.data.data.feedback_list;
+					success: (res) => {
+						this.feedback_list = res.data.data.feedback_list;
 						if(res.data.data.feedback_list.length < 10) {
-							that.isnexttwo = 2;
+							this.isnexttwo = 2;
 						}
 					}
 				})
 			},
 			// 获取酒店信息
             gethoteil() {
-				let that = this;
 				this.request({
 					url:'/v1/store/info',
 					method:'get',
 					data: {
 						store_id: this.goodId
 					},
-					success: function(res) {
+					success: (res) => {
 						let { data } = res.data;
-						console.log(data);
-						that.hotelitle = data.store_name;
-						that.store_slide = data.store_slide;
-						that.store_summary = data.store_summary;
-						that.store_description = data.store_description;
+						this.hotelitle = data.store_name;
+						this.store_slide = data.store_slide;
+						this.store_summary = data.store_summary;
+						this.store_description = data.store_description;
+						this.has_collected = data.has_collected; // 是否收藏
 					}
 				})
 			},
+			
+		
 			changemenu(e) {
 				
 			},

+ 33 - 21
pages/index/index.vue

@@ -10,16 +10,17 @@
 	  refresher-enabled="true">
 	 <uniNavBar class="top"  :shadow="false"  :fixed="false" color="#333333" background-color="#FFFFFF">
 	 	<block  style="width: 70%;padding-left: 32upx;" slot="left">
-	 		<view class="city">
+	 		<view class="city" v-if="!allow">
 	 			<view style="font-size: 35upx;">{{ location }}</view>
 	 		</view>
+			<button v-if="allow" @opensetting='handler'  open-type="openSetting">定位失败,点击重新获取</button>
 	 	</block>
 			<view  class="input-view" style="float: right;">
 			  <uni-icon color="#606266" size="22" @click="scan" type="scan"></uni-icon>
 			</view>
 		<block  slot="right">
 			<view  @click="goinfor">
-				<uni-icon color="#606266"   size="22" type="chat"></uni-icon>
+				<uni-icon color="#606266" size="22" type="chat"></uni-icon>
 			</view>
 		</block>
 	 </uniNavBar>
@@ -50,7 +51,7 @@
 	 </view>
 	 <view style="border-bottom: 2upx solid #EEEEEE;width: 100%;margin-bottom: 24upx 0;"></view>
 	
-	<view>
+	<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/adv/'+item.store_logo"/>
@@ -69,6 +70,9 @@
 	 </view>
 	 </view>
 	 </view>
+	 <view v-if="allow" style="text-align: center;margin: 100upx 0;">
+		 定位失败暂时获取不到周边酒店信息哦
+	 </view>
      </scroll-view>
 
 	</view>
@@ -90,7 +94,6 @@
 		},
 		data() {
 			return {
-				itemurl: '../../image/',
 				page: 1,
 				ispull: true,
 				pagesize: 10,
@@ -110,7 +113,8 @@
 				scrollTop: 0,
 				old: {
 					scrollTop: 0
-				}
+				},
+				allow: false
 			}
 		},
 		computed:{
@@ -122,6 +126,11 @@
 		onLoad() {
 			this.getswiper();   // 获取首页轮播
 			this.gethotelist(); // 酒店列表
+			if(this.allow) {
+				
+			}else {
+				this.gethotelist(); // 酒店列表
+			}
 			this.isGetLocation();  // 检查是否开启定位权限
 			this.isUserInfo();  // 检查是否允许获取用户授权
 			 // 用户授全
@@ -131,8 +140,11 @@
 	    },
 		methods: {
 			...mapMutations(['login','showDialog']),
+			handler() {
+				console.log("kkkkk")
+				this.getAuthorizeInfo();
+			},
 			goinfor() {
-			
 				if(this.hasLogin) {
 					uni.navigateTo({
 					   url: '../myCenter/information'  // 我的收藏
@@ -205,13 +217,13 @@
 					let _this=this;
 					uni.authorize({
 						scope: a,
-						success() { //允许授权
+						success(res) { //允许授权
 						   console.log("调用位置授权")
 							_this.getRegeo();
 						},
 						fail(){    //拒绝授权
+						  _this.allow = true;
 						  _this.$msg("你拒绝了授权,无法获得周边信息")
-							
 						}
 					})
 				},
@@ -224,6 +236,7 @@
 			_this.amapPlugin.getRegeo({  
 				success: (data) => {  
 					this.location = data[0].name;
+					this.allow = false;
 					uni.hideLoading();  
 				},
 				fail: (res) => {
@@ -236,44 +249,43 @@
 			
 			// 获取首页轮播
 			 getswiper() {
-			   let _this = this;
+			  
 				this.request({
 	                url:"/v1/entry/adv",
 	                method:'get',
-					success: function(res) {
-						 _this.backgroundlist = res.data.data;
+					success: (res) => {
+						 this.backgroundlist = res.data.data;
 					}
 			   })
 			 
 			 },
 		 // 获取酒店列表
 		 gethotelist() {
-			  let _this=this;
 			 this.request({
                  url:"/v2/entry/storeList",
                  method:'get',
                  data: {
-                         page: _this.page,
+                         page: this.page,
 						 page_size: 10
                      },
-				success: function(res) {
+				success: (res) => {
 					 let { data,code } = res.data;
 					 if(code == 1000) {
 							 
 						 if(data.store_list.length<10) {
-							 _this.ispull = false;
+							 this.ispull = false;
 						 }
-						 if(_this.hotelist.length == 0) {
-							 _this.hotelist = data.store_list
+						 if(this.hotelist.length == 0) {
+							 this.hotelist = data.store_list
 						 }else {
-							 _this.hotelist =  _this.hotelist.concat(data.store_list);
+							 this.hotelist =  this.hotelist.concat(data.store_list);
 						 }
-						_this.hotelist.forEach(item => {
+						this.hotelist.forEach(item => {
 							item.tages = item.store_summary.split('  ');
 						})
-						 console.log(_this.hotelist)
+						
 					 }else {
-						 _this.$msg("网络错误稍后再试")
+						 this.$msg("网络错误稍后再试")
 					 }
 				}
 		   })

+ 36 - 2
pages/index/searchresult.vue

@@ -5,7 +5,7 @@
 				<view class="input-view">
 					<uni-icon type="search" size="22" color="#666666" />
 					<input confirm-type="search" class="input" type="text" placeholder="输入搜索关键词" 
-							@input="confirm" />
+					@input="confirm" />
 				</view> 
 			 </template>
 			 <template>
@@ -39,6 +39,9 @@
 		components: {
 			uniIcon
 		},
+		onLoad() {
+			this.gethotelist();
+		},
 		data() {
 			return {
 				searchvalue:''
@@ -47,7 +50,38 @@
 		methods: {
 			confirm(e) {
 				this.searchvalue = e.detail.value;
-			}
+			},
+			// 获取酒店列表
+					 gethotelist() {
+						 this.request({
+			                url:"/v2/entry/storeList",
+			                method:'get',
+			                data: {
+			                    page: this.page,
+							    page_size: 10,
+								keyword: this.keyword
+			                 },
+							success: (res) => {
+								 let { data,code } = res.data;
+								 if(code == 1000) {
+									 if(data.store_list.length<10) {
+										 this.ispull = false;
+									 }
+									 if(this.hotelist.length == 0) {
+										 this.hotelist = data.store_list
+									 }else {
+										 this.hotelist =  this.hotelist.concat(data.store_list);
+									 }
+									this.hotelist.forEach(item => {
+										item.tages = item.store_summary.split('  ');
+									})
+									 
+								 }else {
+									 console.log(_this.hotelist).$msg("网络错误稍后再试")
+								 }
+							}
+					   })
+					 },
 		}
 	}
 </script>

+ 1 - 1
pages/index/shop.vue

@@ -495,7 +495,7 @@
 						}
 					})
 				}else {
-					this.showdialog = false;
+					this.showdialog = true;
 				}
  				//this.favorite = !this.favorite;
  			},

+ 84 - 10
pages/myCenter/Settled.vue

@@ -1,35 +1,40 @@
 <template>
 	<view style="padding: 0 32upx;">
 		 <van-field
-		    :value="name"
+		    :value="hotel_name"
 		    placeholder="请输入酒店名称"
 		    label="酒店名称"
+			@change="hotel_name"
 		  />
 		<van-field
-		   :value="name"
+		   :value="contacts_address"
 		   placeholder="请输入酒店地址"
 		   label="酒店地址"
+		    @change="changaddress"
 		 />
 		 <van-field
-		    :value="name"
+		    :value="contacts_name"
 		    placeholder="请输入负责人姓名"
 		    label="负责人"
+			@change="onChange"
 		  />
 		  <van-field
-		     :value="name"
+		     :value="contacts_phone"
 		     placeholder="请输入负责人手机号码"
 		     label="手机号码"
+			  @change="changenumber"
 		   />
 		 <van-field
-		    :value="name"
+		    :value="contacts_number"
 		    placeholder="请输入负责人身份证号码"
 		    label="身份证号码"
+			@change="changIdcard"
 		  />
 		<view>
-				 <uploadImage />
+				 <uploadImage  @getImg="getImg"  />
 				 <view>须上传营业执照和手持身份证照</view>
 		</view>
-		<view class="submitRemin">申请入驻</view>
+		<view class="submitRemin" @click="submitRemin">申请入驻</view>
 		   
 	</view>
 </template>
@@ -42,12 +47,81 @@
 		},
 		data(){
 			return{
-				name:'',
-				imageList:[]
+				imageList:[],
+				hotel_name:'',
+				contacts_address:'',
+				contacts_name:'',
+				contacts_phone:'',
+				contacts_number:''
 			}
 		},
 		methods: {
-			
+			hotel_name(e) {
+				this.hotel_name = e.detail;
+			},
+			onChange(e) {
+			    console.log(e);
+				this.contacts_name = e.detail;
+			},
+			changenumber(e){
+				this.contacts_phone = e.detail;
+			},
+			changIdcard(e) {
+				this.contacts_number = e.detail;
+			},
+			changaddress(e) {
+				this.contacts_address = e.detail;
+			},
+			getImg(e) {
+				console.log(e);
+				this.imageList = e;
+			},
+			submitRemin() {
+				console.log(this.contacts_name)
+				if(this.hotel_name == '') {
+					this.$msg("请输入酒店名称");
+					return;
+				}
+				else if(this.contacts_address == '') {
+					this.$msg("请输入地址");
+					return;
+				}
+				else if(this.contacts_name == '') {
+					this.$msg("请输入姓名");
+					return;
+				}else if(this.contacts_phone == '') {
+					this.$msg("请输入电话号码");
+					return;
+					
+				}else if(this.contacts_number == '') {
+					this.$msg("请输入身份证号码");
+					return;
+				}else if(this.imageList.length == 0) {
+					this.$msg("请上传图片");
+					return;
+				}
+				let licence_image = this.imageList.join(',');
+				this.request({
+					url: '/v2/member/application',
+					method:'post',
+					data: {
+						contacts_name: this.contacts_name,	
+						contacts_phone: this.contacts_phone,		
+						contacts_number	: this.contacts_number,	
+						contacts_address: this.contacts_address,
+					    join_type: 1,
+						licence_image: licence_image
+					},
+					success: (res) => {
+						if(res.data.code == 1000) {
+							this.$msg("申请成功");
+							setTimeout(() => {
+							      uni.navigateBack();
+							    }, 1000);
+						}
+					}
+				})
+			},
 		}
 	}
 </script>

+ 69 - 32
pages/myCenter/applyfor.vue

@@ -1,37 +1,41 @@
 <template>
 	<view style="padding: 0 32upx;">
 		 <van-field
-		    :value="name"
+		    :value="contacts_name"
 		    placeholder="请输入您的姓名"
 		    label="姓名"
+			@change="onChange"
 		  />
 		<van-field
-		   :value="name"
+		   :value="contacts_phone"
 		   placeholder="请输入您的手机号码"
 		   label="手机号码"
+		   @change="changenumber"
 		 />
 		 <van-field
-		    :value="name"
+		    :value="contacts_number"
 		    placeholder="请输入您的身份证号码"
 		    label="身份证号码"
+			@change="changIdcard"
 		  />
 		  <van-field
-		     :value="name"
+		     :value="contacts_address"
 		     placeholder="请输入您的联系地址"
 		     label="联系地址"
+			 @change="changaddress"
 		   />
-		   
 		<view>
-				<uploadImage />
+				<uploadImage @getImg="getImg" />
 				 <view>须上传营业执照和手持身份证照</view>
 		</view>
-		<view class="submitRemin">申请代理</view>
+		<view class="submitRemin" @click="goapply">申请代理</view>
 		   
 	</view>
 </template>
 
 <script>
 	import uploadImage from '@/component/uploadImage.vue'
+	import baseUrl from '@/common/new_file.js'
 	export default {
 		components: {
 			uploadImage
@@ -39,40 +43,73 @@
 		data(){
 			return{
 				name:'',
-				imageList:[]
+				imageList:[],
+				contacts_name:'',	
+				contacts_phone:'',	
+				contacts_number:'',	
+				contacts_address:'',
 			}
 		},
 		methods: {
-			chooseImage() {
-				if (this.imageList.length === 3) {
-					// let isContinue = await this.isFullImg();
-					// console.log("是否继续?", isContinue);
-					// if (!isContinue) {
-					// 	return;
-					// }
+			onChange(e) {
+			    console.log(e);
+				this.contacts_name = e.detail;
+			},
+			changenumber(e){
+				this.contacts_phone = e.detail;
+			},
+			changIdcard(e) {
+				this.contacts_number = e.detail;
+			},
+			changaddress(e) {
+				this.contacts_address = e.detail;
+			},
+			goapply() {
+				console.log(this.contacts_name)
+				if(this.contacts_name == '') {
+					this.$msg("请输入姓名");
+					return;
+				}else if(this.contacts_phone == '') {
+					this.$msg("请输入电话号码");
+					return;
+					
+				}else if(this.contacts_number == '') {
+					this.$msg("请输入身份证号码");
+					return;
+				}else if(this.contacts_address == '') {
+					this.$msg("请输入地址");
+					return;
+				}else if(this.imageList.length == 0) {
+					this.$msg("请上传图片");
 					return;
 				}
-				uni.chooseImage({
-					sourceType: this.sourceType,
-					sizeType: this.sizeType,
-					count: this.imageList.length + this.count[this.countIndex] > 3 ? 3 - this.imageList.length : this.count[this.countIndex],
+				let licence_image = this.imageList.join(',');
+				this.request({
+					url: '/v2/member/application',
+					method:'post',
+					data: {
+						contacts_name: this.contacts_name,	
+						contacts_phone: this.contacts_phone,		
+						contacts_number	: this.contacts_number,	
+						contacts_address: this.contacts_address,
+					    join_type: 0,
+						licence_image: licence_image
+					},
 					success: (res) => {
-						this.imageList = this.imageList.concat(res.tempFilePaths);
-						
-						        uni.uploadFile({
-						            url: 'https://www.example.com/upload', //仅为示例,非真实的接口地址
-						            filePath: tempFilePaths[0],
-						            name: 'file',
-						            formData: {
-						                'user': 'test'
-						            },
-						            success: (uploadFileRes) => {
-						                console.log(uploadFileRes.data);
-						            }
-						        });
+							
+						if(res.data.code == 1000) {
+							this.$msg("申请成功");
+							setTimeout(() => {
+							      uni.navigateBack();
+							    }, 1000);
+						}
 					}
 				})
 			},
+			getImg(e) {
+				console.log(e);
+				this.imageList = e;
+			}
 		}
 	}
 </script>

+ 28 - 7
pages/myCenter/business.vue

@@ -1,15 +1,36 @@
 <template>
 	<view>
-		<van-cell use-label-slot title="城市运行商申请">
-			
-			<template slot="label">
-				请联系:hiodfoihjshshhnvff.com
-			</template>
-		</van-cell>
-	</view>
+		<view v-for="(item,index) in list" :key="index" style="padding: 20upx 0;">
+			<van-cell use-label-slot :title="item.name">
+				<template slot="label">
+					{{item.code}}
+				</template>
+			</van-cell>
+		</view>
+    </view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				list:[
+					{name:'城市运营商申请',code:"请联系:cshz@qzaiwang.com"},
+					{name:'供应商申请',code:"请联系:gys@qzaiwang.com"},
+					{name:'媒体公关',code:"请联系:mt@qzaiwang.com"},
+					{name:'品牌广告',code:"请联系:gg@qzaiwang.com"},
+					{name:'商家入驻',code:"请联系:sj@qzaiwang.com"},
+					{name:'商务合作洽谈',code:"请联系:swhz@qzaiwang.com"}
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		methods:{
+			
+		}
+	}
 </script>
 
 <style>

+ 29 - 4
pages/myCenter/commentback.vue

@@ -4,10 +4,10 @@
 		 <TextArea :tips="tips" @submitValue="submitValue"/>	
 		 <view>
 			<view>添加图片(最多3张)</view>
-			<uploadImage />	
+			<uploadImage @getImg="getImg" />	
 				
 		</view>
-		<view class="submitRemin">提交</view>
+		<view class="submitRemin" @click="submitRemin">提交</view>
 	</view>
 </template>
 
@@ -33,12 +33,37 @@
 			   
 		},
 		methods: {
+			getImg(e) {
+				console.log(e);
+				this.imageList = e;
+			},
 			submitValue(e) {
 				this.goodComment = e.detail.value;
 			},
 			
-			previewImage() {
-				
+			submitRemin() {
+					
+				if(this.goodComment == '') {
+					this.$msg("请输入意见反馈");
+					return;
+				}
+				let images = this.imageList.join(',');
+				this.request({
+					url: '/v2/member/feedback',
+					method: 'post',
+					data: {
+						content: this.goodComment,
+						images: images
+					},
+					success: (res) => {
+						if(res.data.code == 1000) {
+							this.$msg("感谢您的反馈");
+							setTimeout(() => {
+							      uni.navigateBack();
+							    }, 1000);
+						}
+					}
+				})
 			}
 		}
 	}

+ 42 - 4
pages/myCenter/definite.vue

@@ -1,15 +1,15 @@
 <template>
 	<view>
 		<view class="money">
-			<view class="moneysize">47125</view>
+			<view class="moneysize">{{userinfo.member_points}}</view>
 			<view>我的圈币</view>
 		</view>
-		<van-cell use-label-slot title="圈币来源"   label="描述信息">
+		<van-cell v-for="(item,index) in point_list" :key="index" use-label-slot :title="'圈币来源:'+item.pl_desc" >
 			<template>
-				+20
+				+{{item.pl_points}}
 			</template>
 			<template slot="label">
-				djdjauijujkh
+				{{item.pl_addtime}}
 			</template>
 		</van-cell>
 	</view>
@@ -28,6 +28,44 @@
 					   }
 				   })
 	        },
+			data() {
+				return{
+					page: 1,
+					point_list:[],
+					userinfo:{}
+				}
+			},
+			onLoad() {
+				this.getuserinfo();
+				this.getlist();
+			},
+			methods:{
+				getuserinfo() {
+					this.request({
+						url:'/v2/member/info',
+						method:'GET',
+						success:(res)=>{
+							let { data } = res.data;
+							this.userinfo = data;
+						}
+					})
+				},
+				// 获取圈币明细
+				getlist() {
+					this.request({
+						url: '/v2/member/points',
+						method: 'post',
+						data: {
+							page: this.page,
+							page_size: 10
+						},
+						success: (res) => {
+							console.log(res);
+							this.point_list = res.data.data.point_list;
+						}
+					})
+				}
+			}
 	      
 	    }
 </script>

+ 130 - 34
pages/myCenter/index.vue

@@ -11,10 +11,11 @@
 					</view>
                     <view>
 						<view style="font-size: 34upx;margin-bottom: 32upx;">用户名</view>
-						<view style="font-size: 24upx">积分100></view>
+						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{userinfo.member_points}}></view>
 					</view>
 				</view>
-				<view class="myNmaeRight">每日签到></view>
+					<view class="myNmaeRight" v-if="userinfo.has_sign == 0">每日签到></view>
+					<view class="myNmaeRight" v-if="userinfo.has_sign == 1">已签到></view>
 			</view>
 		</view>
 		<van-cell  title="我的订单" is-link />
@@ -114,57 +115,152 @@
 			</template>
 		</van-cell>
 		
-		
+		<!-- <logionDialog @confirmDiaolog="confirmDiaolog"
+		 :ishow="false" @cancelDiaolog="cancelDiaolog"   @keepdialog="keepdialog"
+		 @changeDiaolog="changeDiaolog" :showdialog="showdialog"/> -->
+		 <!--  @keepdialog="keepdialog"
+		 @changeDiaolog="changeDiaolog" -->
 	</view>
 </template>
 
 <script>
 	import uniIcon from '@/component/uni-icon/uni-icon.vue'
+	import logionDialog from '@/component/loginDialog.vue'
+	import {
+		mapMutations,mapState
+	} from 'vuex'
 	export default {
 		components: {
-			uniIcon
+			uniIcon,
+			logionDialog
 		},
 		data() {
-			return {}
+			return {
+				showdialog: false,
+				ishow: false,
+				userinfo: {}
+			}
+		},
+		computed:{
+			...mapState([
+			  'hasLogin',
+			  'userInfo'
+			]),
+		},
+		onLoad() {
+			if(this.hasLogin) {
+				this.getuserinfo();
+		  	}else {
+				uni.navigateTo({
+					url: './logion'
+				})
+				//this.showdialog = true;
+			}
+			
+		},
+		watch:{
+			'hasLogin':function(val) {
+				console.log("监听")
+			   if(val) {
+				  this.getuserinfo(); 
+				   
+			   }else {
+				  uni.navigateTo({
+				  	url: './logion'
+				  })
+			   }
+			},
+			
 		},
 		methods: {
+			getuserinfo() {
+				this.request({
+					url:'/v2/member/info',
+					method:'GET',
+					success: (res)=>{
+						let { data } = res.data;
+						console.log(data);
+						
+						this.userinfo = data;
+					}
+				})
+			},
+			// // 关闭弹窗
+			// cancelDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// // 确定
+			// confirmDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// changeDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// keepdialog() {
+			// 	this.showdialog = true;
+			// },
 			goAdress(e) {
-				if(e == 1) {
-					uni.navigateTo({
-						url: '../myOrder/adress'  // 我的地址
-					})
+				console.log(this.hasLogin)
+				console.log(e);
+				if(this.hasLogin) {
+					if(e == 1) {
+							uni.navigateTo({
+								url: '../myOrder/adress'  // 我的地址
+							})
+					}else if(e == 0) {
+							uni.navigateTo({
+								url: './applyfor'  // 我的申请
+							})
+						
+					}else if(e == 2) {
+							uni.navigateTo({
+								url: './Settled'  // 酒店入驻
+							})
+						
+					}else if(e == 3) {
+						
+							uni.navigateTo({
+								url: './definite'  // 圈币明细
+							})
+							
+					}else if(e == 7) {
 					
-				}else if(e == 0) {
-					uni.navigateTo({
-						url: './applyfor'  // 我的申请
-					})
-				}else if(e == 2) {
-					uni.navigateTo({
-						url: './Settled'  // 酒店入驻
-					})
-				}else if(e == 3) {
-					uni.navigateTo({
-						url: './definite'  // 圈币明细
-					})
-				}else if(e == 7) {
-					uni.navigateTo({
-						url: './business'  // 商务合作
-					})
-				}else if(e == 8) {
+							uni.navigateTo({
+								url: './business'  // 商务合作
+							})
+						
+					}else if(e == 8) {
+						
+							uni.navigateTo({
+								url: './commentback'  // 意见反馈
+							})
+							
+					
+					}else if(e == 9) {
+							uni.navigateTo({
+								url: './myCollect'  // 我的收藏
+							})
+					}
+					}else {
+						uni.navigateTo({
+							url: './logion'
+						})
+						//this.showdialog = true;
+					}
+			},
+				
+			goinfor() {
+				if(this.hasLogin) {
 					uni.navigateTo({
-						url: './commentback'  // 意见反馈
+						url: './information'  // 我的xiaoxi
 					})
-				}else if(e == 9) {
+				}else {
 					uni.navigateTo({
-						url: './myCollect'  // 我的收藏
+						url: './logion'
 					})
+					// this.showdialog = true;
 				}
-			},
 				
-			goinfor() {
-				uni.navigateTo({
-					url: './information'  // 我的收藏
-				})
 			}
 		}
 	}

+ 63 - 11
pages/myCenter/information.vue

@@ -1,22 +1,74 @@
 <template>
 	<view>
-		 
-		  <view class="hotelcontent">
-			 <view class="contentleft">
-				  <image style="width: 100%;height: 100%;"></image>
+		 <scroll-view  style="height: 100vh;" class="floor-list"
+		  :scroll-top="scrollTop" scroll-y="true"  v-if="list.length > 0"   @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+		  refresher-enabled="true">
+			  <view class="hotelcontent" v-for="(item,index) in getlist" :key="index">
+				 <view class="contentleft">
+					  <image style="width: 100%;height: 100%;"></image>
+				  </view>
+				  <view class="contentitle">
+					  <view v-if="item.types == 0">催单信息</view>
+					  <view v-if="item.types == 1">联系酒店</view>
+					  <view v-if="item.types == 2">客户退货</view>
+					  <view>{{item.content}}</view>
+					  <view>订单号:{{item.order_sn}}</view>
+					  <view style="text-align: right;">{{item.add_time}}</view>
+				  </view>
 			  </view>
-			  <view class="contentitle">
-				  <view>催单信息</view>
-				  <view >舒适宽敞</view>
-				  <view>订单号:hiuadhiahiaubfaba</view>
-				  <view style="text-align: right;">20.1-14.52</view>
-			  </view>
-			  
+		  </scroll-view>
+		  <view v-if="list.length == 0" style="text-align: center;margin-top: 300upx;">
+		  		暂无消息通知哦
 		  </view>
 	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+		   return{
+			   list:[],
+			   page: 1,
+			   scrollTop: 0,
+			   old: {
+			   	scrollTop: 0
+			   }
+		   }
+		},
+		onLoad() {
+			this.getlist();
+		},
+		methods: {
+			// 滚动到顶部
+			upper(e) {
+				console.log("顶部")
+			},
+			// 滚到底部
+			lower(e) {
+				this.page = this.page + 1;
+				if(this.ispull) {
+					this.getlist();
+				}
+			},
+			// 滚动时触发
+			scroll(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			getlist() {
+				this.request({
+					url: '/v2/shop/msg_list',
+					method: 'POST',
+					data: {
+						page: this.page,
+						page_size: 10
+					},
+					success: (res) => {
+						this.list = this.list.concat(res.data.data.msg_list);
+					}
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss">

+ 68 - 0
pages/myCenter/logion.vue

@@ -0,0 +1,68 @@
+<template>
+	<view>
+		<view style="text-align: center;margin: 100upx;font-size: 36upx;">欢迎回来</view>
+		<view style="width: 50%;margin: 0 auto;">
+			<button @click="wxlogion" open-type='getUserInfo'>
+				授权登录
+			</button>
+		</view>
+		
+	<!-- 	<van-dialog  title="请登录"
+		:show-cancel-button="ishow"
+		:show="show"
+		@cancel="cancelDialog" @confirm="confirmOrder"
+		confirm-button-open-type="getUserInfo"	
+		confirm-button-color = "#323232"	
+		>
+		</van-dialog> -->
+			<!-- <button @click="wxlogion"   open-type="getUserInfo">请点击授权</button> -->
+	</view>
+	
+</template>
+
+<script>
+	import {
+		mapMutations,mapState
+	} from 'vuex'
+	export default {
+		props:{
+		  showdialog:{
+		    default: false,
+		    type: Boolean
+		  },
+		  ishow:{
+		    default: true,
+		    type: Boolean
+		  },
+		},
+		 data() {
+			return{
+				show: false
+			}
+		},
+		
+		methods:{
+			...mapMutations(['login','showDialog']),
+			wxlogion() {
+				let  that = this;
+				    uni.getUserInfo({
+					     success(res) {
+							 that.login(res.userInfo);
+							 that.showDialog(true); // 改变haslogion的值
+						//	 that.$emit('confirmDiaolog');
+							 that.$msg("登录成功")
+							 uni.navigateBack()
+					     },
+					     fail(res) {
+						     //that.$emit('keepdialog');  // 订单我的保持登录
+							 that.showDialog(false);
+							 that.$msg("登录失败")
+					     }
+				    })
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 101 - 40
pages/myCenter/myCollect.vue

@@ -1,49 +1,54 @@
 <template>
 	<view>
-		<van-tabs :active="active" bind:change="onChange">
+		<van-tabs :active="active" @change="onChange">
 		  <van-tab :name="1" title="酒店">
-			  <view>
-				  <van-cell title="酒店" title-class	="titlepadding">
-					  <template slot="icon">
-						  <image src="" style="width: 50upx;height: 50upx;background-color: #007AFF;border-radius: 50%;"></image>
-					  </template>
-				  </van-cell>
-				  <view class="hotelcontent">
-					 <view class="contentleft">
-						  <image style="width: 100%;height: 100%;"></image>
-					  </view>
-					  <view class="contentitle">
-						  <view>乐成国际大酒店</view>
-						  <view class="contentip">舒适宽敞</view>
-					  </view>
-					  
-				  </view>
-			  </view>
 		  </van-tab>
 		  <van-tab :name="2"  title="商品">
-			  <view>
-				  <van-cell title="酒店" title-class	="titlepadding">
-					  <template slot="icon">
-						  <image src="" style="width: 50upx;height: 50upx;background-color: #007AFF;border-radius: 50%;"></image>
-					  </template>
-				  </van-cell>
-				 <view style="border-bottom: 20upx solid #F5F5F5;">
-					  <van-card
-						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"
-					  >
-					  </van-card>
-				 </view>
-			  </view>
-			 
-			  
 		  </van-tab>
 		</van-tabs>
+		<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">
+		  				  <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%;
+								  width: 50upx;height: 50upx;vertical-align: middle;"></image>
+		  					  </template>
+		  				  </van-cell>
+		  				  <view class="hotelcontent">
+		  					 <view class="contentleft">
+		  						 <image :src="pictureUrl+'/uploads/home/store/'+item.store_id+'/'+item.store_avatar" 
+								 style="width: 100%;height: 100%;vertical-align: middle;"></image>
+		  					  </view>
+		  					  <view class="contentitle">
+		  						  <view>{{item.store_name}}</view>
+		  						  <view class="contentip">{{item.store_summary}}</view>
+		  					  </view>
+		  					  
+		  				  </view>
+		  </view>
+		  <view v-if="active == 2" v-for="(item,index) in goods_list" :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%;
+		  						 width: 50upx;height: 50upx;vertical-align: middle;"></image>
+		  					  </template>
+		  				  </van-cell>
+		  				 <view style="border-bottom: 20upx solid #F5F5F5;">
+		  					  <van-card
+		  						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"
+		  					  >
+		  					  </van-card>
+		  				 </view>
+		  </view>
+		</scroll-view>
 	</view>
 </template>
 
@@ -51,8 +56,64 @@
 	export default {
 		data() {
 			return {
-				active: 1
+				pictureUrl: this.pictureUrl,
+				active: 1,
+				type: 'store',
+				page: 1,
+				page_size: 10,
+				scrollTop:0,
+				old: {
+					scrollTop: 0
+				},
+				store_list:[],
+				goods_list:[]
 			}
+		},
+		onLoad() {
+			this.getlist();
+		},
+		methods: {
+			upper(e) {
+				console.log(e)
+				console.log("顶部")
+			},
+			// 滚到底部
+			lower(e) {
+				console.log("底部")
+			},
+			// 滚动时触发
+			scroll(e) {
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			onChange(e) {
+				console.log(e);
+				this.active = e.detail.name;
+				if(e.detail.name == 1) {
+					this.type = 'store';
+				}else {
+					this.type = 'goods';
+				}
+				this.getlist();
+			},
+			getlist() {
+				this.request({
+					url: '/v1/favorites/get',
+					method: 'post',
+					scrollTop: 0,
+					data: {
+						type: this.type,
+						page: this.page,
+						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 );
+					}
+				})
+			},
 		}
 	}
 </script>

+ 1 - 1
pages/myOrder/adress.vue

@@ -3,7 +3,7 @@
 		<view class="list b-b" v-for="(item, index) in addressList" :key="index">
 			<view  @click="checkAddress(item)" class="wrapper">
 				<view class="u-box">
-					<text v-if="item.address_is_default" class="tag">↑</text>
+					<text v-if="item.address_is_default == 1" class="tag">↑</text>
 					<text class="name">{{item.address_realname}}</text>
 					<text class="mobile">{{item.address_mob_phone}}</text>
 				</view>

+ 70 - 19
pages/myOrder/index.vue

@@ -44,28 +44,42 @@
 		  </view>
 		
 		</scroll-view> 
-		<view  v-if="order_list.length == 0" >
+		<view  v-if="order_list.length == 0 && hasLogin" >
 			  <view style="margin: 120upx auto;text-align: center;">
 					<van-icon size="160rpx" color="#909399" name="description" />
 					<view style="text-align: center;color: #909399;"> 去买点什么</view>
 			  </view>
 		</view>
+		<view  v-if="order_list.length == 0 && !hasLogin" >
+			  <view style="margin: 120upx auto;text-align: center;">
+					<van-icon size="160rpx" color="#909399" name="description" />
+					<view style="text-align: center;color: #909399;">啥都没有
+					<span style="color: #F76260;" @click="gotologion">去登录吧</span></view>
+			  </view>
+		</view>
 		<Dialog  :orderCancel="orderCancel"
 		    :titles="titles"
 		    @colseDialog="cancelDialog" 
 		    @confirmPay="confirmOrder"
 		 />
+		<!--  <logionDialog @confirmDiaolog="confirmDiaolog" :ishow="false" @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/> -->
 	</view>
 </template>
 
 <script>
+	import {
+		mapMutations,mapState
+	} from 'vuex'
 	import Dialog from '@/component/Dialog.vue'
+	import logionDialog from '@/component/loginDialog.vue'
 	export default{
 		components: {
-			Dialog
+			Dialog,
+			logionDialog
 		},
 		data() {
 			return {
+				showdialog: false,
 				orderCancel: false,
 				titles:'',
 				pictureUrl: this.pictureUrl,
@@ -90,30 +104,66 @@
 				order_list:[]
 			}
 		},
+		computed:{
+			...mapState([
+			  'hasLogin',
+			  'userInfo'
+			]),
+		},
 		onLoad() {
-			uni.$on("refehlist",()=>{
+			uni.$emit("refehlist",()=>{
 			      this.getlist();
 			  })
-			this.getlist(); // 获取订单
+			if(this.hasLogin) {
+				this.getlist(); // 获取订单
+				
+		  	}else {
+				uni.navigateTo({
+					url: '/pages/myCenter/logion'
+				})
+				//this.showdialog = true;
+			}
+			
 		},
 		methods: {
+			gotologion() {
+				uni.navigateTo({
+					url: '/pages/myCenter/logion'
+				})
+			},
+			// 关闭弹窗
+			// cancelDiaolog() {
+			// 	this.showdialog = false;
+			// },
+			// // 确定
+			// confirmDiaolog() {
+			// 	this.showdialog = false;
+			// 	this.getlist(); // 获取订单
+			// },
 			changeselect(e) {
-				console.log(e);
-				this.active = e.target.name;
-				if(e.target.name == 0) {
-					this.state = 'all';
-				}else if(e.target.name == 1) {
-					this.state = 'waiting';
-				}else if(e.target.name == 2) {
-					this.state = 'payed';
-				}else if(e.target.name == 3) {
-					this.state = 'complete';
-				}else if(e.target.name == 4) {
-					this.state = 'cancel';
-				}else if(e.target.name == 5) {
-					this.state = 'refund';
+				if(this.hasLogin) {
+					  console.log(e);
+					  this.active = e.target.name;
+					  if(e.target.name == 0) {
+						this.state = 'all';
+					  }else if(e.target.name == 1) {
+						this.state = 'waiting';
+					  }else if(e.target.name == 2) {
+						this.state = 'payed';
+					  }else if(e.target.name == 3) {
+						this.state = 'complete';
+					  }else if(e.target.name == 4) {
+						this.state = 'cancel';
+					  }else if(e.target.name == 5) {
+						this.state = 'refund';
+					  }
+					  this.getlist();	
+				}else {
+					uni.navigateTo({
+						url: '/pages/myCenter/logion'
+					})
 				}
-				this.getlist();
+				
 			},
 			getlist() {
 				this.request({
@@ -180,6 +230,7 @@
 				this.old.scrollTop = e.detail.scrollTop
 			}
 		}
+		
 	}
 </script>
   

+ 0 - 1
pages/myOrder/order.vue

@@ -111,7 +111,6 @@
 					},
 					success: (res) => {
 						this.detail = res.data.data;
-						detail.order_amount
 						console.log(this.detail);
 					}
 				})

+ 58 - 33
pages/myone/oneIndex.vue

@@ -11,23 +11,18 @@
 			 <van-tab  v-for="(item,index) in typelist"  :key="index" :name="index" :title="item.ac_name"></van-tab>
 		   </van-tabs>
 	   </view>
-	  
-	  <!-- refresher-enabled  开启自定义下拉--> 
-		 <scroll-view class="floor-list" 
-		  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
-		  @refresherabort="onAbort"
-		  @refresherrefresh="onRefresh"
-		  @refresherpulling="onPulling"
-		  refresher-enabled="true">
-			<view>
+		  <scroll-view  class="floor-list"
+		   :scroll-top="scrollTop" style="height: 90vh;" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
+		   refresher-enabled="true">
+			<view v-for="(item,indedx) in acrelist" :key="indedx" @click="goIndex(item)">
 			   <view class="hotelList">
 					 <view class="hotleLeft">
-						 <image  style="width: 214upx;height: 152upx;" src=""/>
+						 <image  style="width: 214upx;height: 152upx;" :src="item.article_thumb"/>
 					 </view>
 					 <view class="hotelright">
-						<view style="font-size: 28upx;color: #303133;">华南城市酒店</view>
+						<view style="font-size: 28upx;color: #303133;">{{item.article_title}}</view>
 						<view>
-							07-05 14:58
+						   {{item.article_time}}
 						</view>
 					
 			   </view>
@@ -53,7 +48,9 @@
 				old: {
 					scrollTop: 0
 				},
-				typelist:[]
+				typelist:[],
+				acrelist:[],
+				ispull: true
 		    }
 	    },
 		onLoad() {
@@ -61,43 +58,68 @@
 			this.getlist(); // 获取文章列表
 		},
 		methods: {
+			goIndex(items) {
+				let article_id = items.article_id;
+				let ac_id = items.ac_id;
+				let name = '';
+				this.typelist.forEach((item, index) => {
+					if(item.ac_id == ac_id) {
+						name = item.ac_name;
+					}
+				})
+				uni.navigateTo({
+				        url: `/pages/myone/onedetail?id=${article_id}&name=${name}`
+				});
+			},
 			getype() {
 				this.request({
 					url: '/v1/entry/news_cate',
+					method:'POST',
 					success: (res) => {
 						let array = [{ac_name:'全部'}];
 						this.typelist = array.concat(res.data.data);
-						console.log(this.typelist);
 					}
 				})
 			},
 			getlist() {
 				this.request({
-					url: '',
-					method:'POST'
+					url: '/v1/entry/news',
+					method:'POST',
+					data: {
+						page: this.page,
+						page_size: this.page_size,
+						ac_id: this.ac_id,
+						keyword: this.keyword
+					},
+					success: (res) => {
+						let { data }  = res.data;
+						if(data.total_page == data.current_page) {
+							console.log("ooooo")
+							this.ispull = false;
+						}
+						this.acrelist = this.acrelist.concat(data.new_list);
+						console.log(this.acrelist);
+						console.log(data.total_page);
+					}
 				})
 			},
 			
 			confirm() {
 				
 			},
-			onChange(event,) {
-				console.log(event);
+			onChange(event) {
 				this.active = event.detail.name;
-			},
-			// 自定义下拉控件被触发
-			onPulling() {
-				
-			},
-			
-			// 自定义下拉刷新被触发
-			onRefresh() {
-				
-			},
-			
-			// 自定义下拉刷新被中止
-			onAbort() {
-				
+				if( event.detail.name == 0) {
+					this.ac_id = '';
+				}else {
+					let items = this.typelist[this.active];
+					this.ac_id = items.ac_id;
+				}
+				this.active = event.detail.name;
+				this.ispull = true;
+				this.page = 1;
+				this.acrelist = [];
+				this.getlist();
 			},
 			
 			// 滚动到顶部
@@ -108,7 +130,10 @@
 			
 			// 滚到底部
 			lower(e) {
-				console.log("底部")
+				this.page = this.page + 1;
+				if(this.ispull) {
+					this.getlist();
+				}
 			},
 			
 			// 滚动时触发

+ 43 - 0
pages/myone/onedetail.vue

@@ -0,0 +1,43 @@
+<template>
+		<view style="padding: 20upx 32upx;">
+			<rich-text :nodes="nodes"></rich-text>
+		</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				article_id: '',
+				nodes:''
+		    }
+		},
+		onLoad(a) {
+			console.log(a);
+			this.article_id = a.id;
+			let name = a.name;
+			uni.setNavigationBarTitle({
+			    title: name
+			});
+			this.getactrile();
+		},
+		
+		methods: {
+			getactrile() {
+				this.request({
+					url: '/v1/entry/news_desc',
+					method: 'post',
+					data: {
+						article_id: this.article_id		 
+					},
+					success: (res) => {
+						this.nodes = res.data.data.article_content;
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style>
+</style>

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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

@@ -8,6 +8,7 @@
     "pages/index/commemt",
     "pages/index/searchresult",
     "pages/myone/oneIndex",
+    "pages/myone/onedetail",
     "pages/myOrder/index",
     "pages/index/sureBuy",
     "pages/myOrder/paymoment",
@@ -20,6 +21,7 @@
     "pages/myCenter/applyfor",
     "pages/myCenter/Settled",
     "pages/myCenter/definite",
+    "pages/myCenter/logion",
     "pages/myCenter/business",
     "pages/myCenter/commentback",
     "pages/myCenter/myCollect",
@@ -63,5 +65,5 @@
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
   },
-  "sitemapLocation": "sitemap56.json"
+  "sitemapLocation": "sitemap81.json"
 }

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


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


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


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


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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["component/loginDialog"],{
 
-/***/ 223:
+/***/ 229:
 /*!****************************************************!*\
   !*** 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& */ 224);
-/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 226);
+/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 230);
+/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 232);
 /* 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"
 
 /***/ }),
 
-/***/ 224:
+/***/ 230:
 /*!***********************************************************************************!*\
   !*** 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& */ 225);
+/* 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& */ 231);
 /* 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__);
 
 /***/ }),
 
-/***/ 225:
+/***/ 231:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 226:
+/***/ 232:
 /*!*****************************************************************************!*\
   !*** 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& */ 227);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __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& */ 233);
 /* 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); 
 
 /***/ }),
 
-/***/ 227:
+/***/ 233:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -135,6 +135,10 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
   props: {
     showdialog: {
       default: false,
+      type: Boolean },
+
+    ishow: {
+      default: true,
       type: Boolean } },
 
 
@@ -145,22 +149,28 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
   },
   watch: {
     'showdialog': function showdialog(val) {
+      console.log("jinlaile");
+      console.log(val);
       if (val) {
         this.show = true;
       } else {
         this.show = false;
       }
+      console.log(this.show);
     } },
 
   methods: _objectSpread({},
   (0, _vuex.mapMutations)(['login', 'showDialog']), {
     cancelDialog: function cancelDialog() {
-      this.$msg('登录失败');
-      this.login();
+      this.show = false;
       this.$emit('cancelDiaolog');
       this.showDialog(false);
+      this.login();
+      this.$msg('登录失败');
     },
     confirmOrder: function confirmOrder() {
+      this.show = false;
+      this.$emit('changeDiaolog');
       this.wxlogion();
     },
     wxlogion: function wxlogion() {
@@ -168,12 +178,13 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
       uni.getUserInfo({
         success: function success(res) {
           that.login(res.userInfo);
-          that.showDialog(true);
+          that.showDialog(true); // 改变haslogion的值
           that.$emit('confirmDiaolog');
           that.$msg("登录成功");
         },
         fail: function fail(res) {
-          console.log(res);
+          that.$emit('keepdialog'); // 订单我的保持登录
+          that.showDialog(false);
           that.$msg("登录失败");
         } });
 
@@ -188,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__(223))
+            __webpack_require__('1')['createComponent'](__webpack_require__(229))
         })
     },
     [['component/loginDialog-create-component']]

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

@@ -1 +1 @@
-<view><van-dialog vue-id="c0a83d76-1" title="请登录" show-cancel-button="true" show="{{show}}" confirm-button-open-type="getUserInfo" confirm-button-color="#323232" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></van-dialog></view>
+<view><van-dialog vue-id="c0a83d76-1" title="请登录" show-cancel-button="{{ishow}}" show="{{show}}" confirm-button-open-type="getUserInfo" confirm-button-color="#323232" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></van-dialog></view>

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


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


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


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


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


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


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


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


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


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

@@ -1 +1 @@
-<view class="cell-pd"><view class="uni-uploader"><view class="uni-uploader-body"><view class="uni-uploader__files"><block wx:for="{{imageList}}" wx:for-item="image" wx:for-index="index" wx:key="index"><block><view class="uni-uploader__file"><image class="uni-uploader__img" src="{{image}}" data-src="{{image}}" data-event-opts="{{[['tap',[['previewImage',['$event']]]]]}}" bindtap="__e"></image></view></block></block><block wx:if="{{imageList.length!=3}}"><view class="uni-uploader__input-box deepHeight"><view data-event-opts="{{[['tap',[['chooseImage',['$event']]]]]}}" class="uni-uploader__input" bindtap="__e"></view></view></block></view></view></view></view>
+<view class="cell-pd"><view class="uni-uploader"><view class="uni-uploader-body"><view class="uni-uploader__files"><block wx:for="{{imageList}}" wx:for-item="image" wx:for-index="index" wx:key="index"><block><view class="uni-uploader__file" style="position:relative;"><image class="uni-uploader__img" src="{{image}}" data-src="{{image}}"></image><view data-event-opts="{{[['tap',[['deleteImg',[index]]]]]}}" style="position:absolute;right:0;top:0;" bindtap="__e">X</view></view></block></block><block wx:if="{{imageList.length!=3}}"><view class="uni-uploader__input-box deepHeight"><view data-event-opts="{{[['tap',[['chooseImage',['$event']]]]]}}" class="uni-uploader__input" bindtap="__e"></view></view></block></view></view></view></view>

+ 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 */ 209));}).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 */ 247));}).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 */ 215));}).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 */ 253));}).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 */ 242));}).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 */ 248));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
 
 
 

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


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


+ 1 - 1
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 */ 235));}).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 */ 241));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};
 
 
 

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


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


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

@@ -131,7 +131,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! @/component/uni-icon/uni-icon.vue */ 216));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uniIcon = function uniIcon() {__webpack_require__.e(/*! require.ensure | component/uni-icon/uni-icon */ "component/uni-icon/uni-icon").then((function () {return resolve(__webpack_require__(/*! @/component/uni-icon/uni-icon.vue */ 222));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 
@@ -172,6 +172,9 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   components: {
     uniIcon: uniIcon },
 
+  onLoad: function onLoad() {
+    this.gethotelist();
+  },
   data: function data() {
     return {
       searchvalue: '' };
@@ -180,6 +183,37 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
   methods: {
     confirm: function confirm(e) {
       this.searchvalue = e.detail.value;
+    },
+    // 获取酒店列表
+    gethotelist: function gethotelist() {var _this2 = this;
+      this.request({
+        url: "/v2/entry/storeList",
+        method: 'get',
+        data: {
+          page: this.page,
+          page_size: 10,
+          keyword: this.keyword },
+
+        success: function success(res) {var _res$data =
+          res.data,data = _res$data.data,code = _res$data.code;
+          if (code == 1000) {
+            if (data.store_list.length < 10) {
+              _this2.ispull = false;
+            }
+            if (_this2.hotelist.length == 0) {
+              _this2.hotelist = data.store_list;
+            } else {
+              _this2.hotelist = _this2.hotelist.concat(data.store_list);
+            }
+            _this2.hotelist.forEach(function (item) {
+              item.tages = item.store_summary.split('  ');
+            });
+
+          } else {
+            console.log(_this.hotelist).$msg("网络错误稍后再试");
+          }
+        } });
+
     } } };exports.default = _default;
 
 /***/ }),

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


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


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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/Settled"],{
 
-/***/ 165:
+/***/ 171:
 /*!************************************************************************!*\
   !*** 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 */ 166));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _Settled = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/Settled.vue */ 172));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"]))
 
 /***/ }),
 
-/***/ 166:
+/***/ 172:
 /*!*****************************************************!*\
   !*** 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& */ 167);
-/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 169);
+/* harmony import */ var _Settled_vue_vue_type_template_id_dfc9d076___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./Settled.vue?vue&type=template&id=dfc9d076& */ 173);
+/* harmony import */ var _Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Settled.vue?vue&type=script&lang=js& */ 175);
 /* 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"
 
 /***/ }),
 
-/***/ 167:
+/***/ 173:
 /*!************************************************************************************!*\
   !*** 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& */ 168);
+/* 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& */ 174);
 /* 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__);
 
 /***/ }),
 
-/***/ 168:
+/***/ 174:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 169:
+/***/ 175:
 /*!******************************************************************************!*\
   !*** 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& */ 170);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_Settled_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __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& */ 176);
 /* 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); 
 
 /***/ }),
 
-/***/ 170:
+/***/ 176:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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,12 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uploadImage = function uploadImage() {__webpack_require__.e(/*! require.ensure | component/uploadImage */ "component/uploadImage").then((function () {return resolve(__webpack_require__(/*! @/component/uploadImage.vue */ 275));}).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 */ 281));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+
+
+
+
+
 
 
 
@@ -173,13 +178,84 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
   data: function data() {
     return {
-      name: '',
-      imageList: [] };
+      imageList: [],
+      hotel_name: '',
+      contacts_address: '',
+      contacts_name: '',
+      contacts_phone: '',
+      contacts_number: '' };
 
   },
-  methods: {} };exports.default = _default;
+  methods: {
+    hotel_name: function hotel_name(e) {
+      this.hotel_name = e.detail;
+    },
+    onChange: function onChange(e) {
+      console.log(e);
+      this.contacts_name = e.detail;
+    },
+    changenumber: function changenumber(e) {
+      this.contacts_phone = e.detail;
+    },
+    changIdcard: function changIdcard(e) {
+      this.contacts_number = e.detail;
+    },
+    changaddress: function changaddress(e) {
+      this.contacts_address = e.detail;
+    },
+    getImg: function getImg(e) {
+      console.log(e);
+      this.imageList = e;
+    },
+    submitRemin: function submitRemin() {var _this = this;
+      console.log(this.contacts_name);
+      if (this.hotel_name == '') {
+        this.$msg("请输入酒店名称");
+        return;
+      } else
+      if (this.contacts_address == '') {
+        this.$msg("请输入地址");
+        return;
+      } else
+      if (this.contacts_name == '') {
+        this.$msg("请输入姓名");
+        return;
+      } else if (this.contacts_phone == '') {
+        this.$msg("请输入电话号码");
+        return;
+
+      } else if (this.contacts_number == '') {
+        this.$msg("请输入身份证号码");
+        return;
+      } else if (this.imageList.length == 0) {
+        this.$msg("请上传图片");
+        return;
+      }
+      var licence_image = this.imageList.join(',');
+      this.request({
+        url: '/v2/member/application',
+        method: 'post',
+        data: {
+          contacts_name: this.contacts_name,
+          contacts_phone: this.contacts_phone,
+          contacts_number: this.contacts_number,
+          contacts_address: this.contacts_address,
+          join_type: 1,
+          licence_image: licence_image },
+
+        success: function success(res) {
+          if (res.data.code == 1000) {
+            _this.$msg("申请成功");
+            setTimeout(function () {
+              uni.navigateBack();
+            }, 1000);
+          }
+        } });
+
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ })
 
-},[[165,"common/runtime","common/vendor"]]]);
+},[[171,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/Settled.js.map

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

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

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


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

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

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/myCenter/business"],{
 
-/***/ 179:
+/***/ 185:
 /*!*************************************************************************!*\
   !*** 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 */ 180));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}
+var _business = _interopRequireDefault(__webpack_require__(/*! ./pages/myCenter/business.vue */ 186));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"]))
 
 /***/ }),
 
-/***/ 180:
+/***/ 186:
 /*!******************************************************!*\
   !*** 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& */ 181);
-/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 183);
+/* harmony import */ var _business_vue_vue_type_template_id_626f98f8___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./business.vue?vue&type=template&id=626f98f8& */ 187);
+/* harmony import */ var _business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./business.vue?vue&type=script&lang=js& */ 189);
 /* 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"
 
 /***/ }),
 
-/***/ 181:
+/***/ 187:
 /*!*************************************************************************************!*\
   !*** 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& */ 182);
+/* 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& */ 188);
 /* 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__);
 
 /***/ }),
 
-/***/ 182:
+/***/ 188:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 183:
+/***/ 189:
 /*!*******************************************************************************!*\
   !*** 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& */ 184);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_business_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __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& */ 190);
 /* 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); 
 
 /***/ }),
 
-/***/ 184:
+/***/ 190:
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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& ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -129,6 +129,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
 //
 //
 //
@@ -140,9 +141,26 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+var _default =
+{
+  data: function data() {
+    return {
+      list: [
+      { name: '城市运营商申请', code: "请联系:cshz@qzaiwang.com" },
+      { name: '供应商申请', code: "请联系:gys@qzaiwang.com" },
+      { name: '媒体公关', code: "请联系:mt@qzaiwang.com" },
+      { name: '品牌广告', code: "请联系:gg@qzaiwang.com" },
+      { name: '商家入驻', code: "请联系:sj@qzaiwang.com" },
+      { name: '商务合作洽谈', code: "请联系:swhz@qzaiwang.com" }] };
 
 
+  },
+  onLoad: function onLoad() {
+
+  },
+  methods: {} };exports.default = _default;
+
 /***/ })
 
-},[[179,"common/runtime","common/vendor"]]]);
+},[[185,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/myCenter/business.js.map

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/myCenter/business.wxml

@@ -1 +1 @@
-<view><van-cell vue-id="33774a3e-1" use-label-slot title="城市运行商申请" data-com-type="wx" bind:__l="__l" vue-slots="{{['label']}}"><view slot="label">请联系:hiodfoihjshshhnvff.com</view></van-cell></view>
+<view><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view style="padding:20rpx 0;"><van-cell vue-id="{{'33774a3e-1-'+index}}" use-label-slot title="{{item.name}}" data-com-type="wx" bind:__l="__l" vue-slots="{{['label']}}"><view slot="label">{{''+item.code+''}}</view></van-cell></view></block></view>

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


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/myCenter/commentback.wxml

@@ -1 +1 @@
-<view class="layout"><text-area vue-id="2a9b4f55-1" tips="{{tips}}" data-event-opts="{{[['^submitValue',[['submitValue']]]]}}" bind:submitValue="__e" bind:__l="__l"></text-area><view><view>添加图片(最多3张)</view><upload-image vue-id="2a9b4f55-2" bind:__l="__l"></upload-image></view><view class="submitRemin">提交</view></view>
+<view class="layout"><text-area vue-id="2a9b4f55-1" tips="{{tips}}" data-event-opts="{{[['^submitValue',[['submitValue']]]]}}" bind:submitValue="__e" bind:__l="__l"></text-area><view><view>添加图片(最多3张)</view><upload-image bind:getImg="__e" vue-id="2a9b4f55-2" data-event-opts="{{[['^getImg',[['getImg']]]]}}" bind:__l="__l"></upload-image></view><view data-event-opts="{{[['tap',[['submitRemin',['$event']]]]]}}" class="submitRemin" bindtap="__e">提交</view></view>

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


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/myCenter/definite.wxml

@@ -1 +1 @@
-<view><view class="money"><view class="moneysize">47125</view><view>我的圈币</view></view><van-cell vue-id="751a1431-1" use-label-slot title="圈币来源" label="描述信息" data-com-type="wx" bind:__l="__l" vue-slots="{{['default','label']}}">+20<view slot="label">djdjauijujkh</view></van-cell></view>
+<view><view class="money"><view class="moneysize">{{userinfo.member_points}}</view><view>我的圈币</view></view><block wx:for="{{point_list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><van-cell vue-id="{{'751a1431-1-'+index}}" use-label-slot title="{{'圈币来源:'+item.pl_desc}}" data-com-type="wx" bind:__l="__l" vue-slots="{{['default','label']}}">{{'+'+item.pl_points+''}}<view slot="label">{{''+item.pl_addtime+''}}</view></van-cell></block></view>

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


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