分享

common/request.js

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

component/popup.vue

@@ -0,0 +1,255 @@
+<template>
+	<view>
+	<!-- 	<view class="example">
+			<view class="example-title">基本用法</view>
+			<button type="button" @click="togglePopup('top')">顶部弹出 popup</button>
+			<uniPopup :show="type === 'top'" position="top" mode="fixed" msg="顶部弹出popup" @hidePopup="togglePopup('')" />
+			<button type="button" @click="togglePopup('middle')">居中弹出 popup</button>
+			<uniPopup :show="type === 'middle'" position="middle" mode="fixed" msg="居中弹出popup" @hidePopup="togglePopup('')" />
+			<button type="button" @click="togglePopup('bottom')">底部部弹出 popup</button>
+			<uniPopup :show="type === 'bottom'" position="bottom" mode="fixed" msg="底部弹出popup" @hidePopup="togglePopup('')" />
+		</view> -->
+		<view class="example">
+			<!-- <view class="example-title">slot用法</view> -->
+			<!-- <button type="button" @click="togglePopup('middle-img')">居中弹出（插屏广告）</button> -->
+			<uniPopup :show="type" position="middle" mode="insert" @hidePopup="togglePopup('')">
+				<view class="uni-center center-box">
+					<image class="image" src="" style="background-color: #007AFF;" />
+				</view>
+			</uniPopup>
+			<!-- <button type="button" @click="togglePopup('middle-list')">居中弹出（滚动列表）</button>
+			<uniPopup :show="type === 'middle-list'" position="middle" mode="fixed" @hidePopup="togglePopup('')">
+				<scroll-view :scroll-y="true" class="uni-center center-box">
+					<view v-for="(item, index) in list" :key="index" class="uni-list-item">滚动列表数据 {{ item }}</view>
+				</scroll-view>
+			</uniPopup> -->
+			<!-- <button type="button" data-position="bottom" @click="togglePopup('bottom-share')">底部弹出（分享界面）</button>
+			<uniPopup :show="type === 'bottom-share'" position="bottom" @hidePopup="togglePopup('')">
+				<view style="display: block;">
+					<view class="bottom-title">分享到</view>
+					<view class="bottom-content">
+						<view v-for="(item, index) in bottomData" :key="index" class="bottom-content-box">
+							<view :class="item.name" class="bottom-content-image">
+								<text class="icon">{{ item.icon }}</text>
+							</view>
+							<view class="bottom-content-text">{{ item.text }}</view>
+						</view>
+					</view>
+					<view class="bottom-btn" @click="togglePopup('')">取消分享</view>
+				</view>
+			</uniPopup> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniPopup from './uni-popup.vue'
+	export default {
+		props: {
+			ishow: {
+				default: false,
+				type: Boolean
+			}
+		},
+		components: {
+			uniPopup
+		},
+		// watch: {
+		// 	'ishow':function(val) {
+		// 		if(val) {
+		// 			this.type = true;
+					
+		// 		}else {
+		// 			this.type = false;
+		// 		}
+		// 	},
+		// },
+		data() {
+			return {
+				type: true,
+				list: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'],
+				bottomData: [{
+						text: '微信',
+						icon: '\ue6a4',
+						name: 'wx'
+					},
+					{
+						text: '朋友圈',
+						icon: '\ue646',
+						name: 'wx'
+					},
+					{
+						text: 'QQ',
+						icon: '\ue66b',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: '\ue600',
+						name: 'sina'
+					},
+					{
+						text: '复制',
+						icon: '\ue632',
+						name: 'copy'
+					},
+					{
+						text: '更多',
+						icon: '\ue618',
+						name: 'more'
+					}
+				]
+			};
+		},
+		onBackPress() {
+			if (this.type !== '') {
+				this.type = '';
+				return true;
+			}
+		},
+		methods: {
+			togglePopup() {
+				this.type = false;
+			}
+		}
+	};
+</script>
+<style>
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #fff
+	}
+
+	view {
+		font-size: 28upx;
+		line-height: inherit
+	}
+
+	.example {
+		padding: 0 30upx 30upx
+	}
+
+	.example-title {
+		font-size: 32upx;
+		line-height: 32upx;
+		color: #777;
+		margin: 40upx 25upx;
+		position: relative
+	}
+
+	.example .example-title {
+		margin: 40upx 0
+	}
+
+	.example-body {
+		padding: 0 40upx
+	}
+
+	.uni-padding-wrap {
+		padding: 0 30upx;
+	}
+
+	button {
+		margin: 20upx 0;
+	}
+
+	.uni-helllo-text {
+		height: 100upx;
+		line-height: 100upx;
+		text-align: center;
+	}
+
+	.center-box {
+		width: 500upx;
+		height: 500upx;
+	}
+
+	.uni-list-item {
+		text-align: left;
+		line-height: 80upx;
+		border-bottom: 1px #f5f5f5 solid;
+	}
+
+	.uni-list-item:last-child {
+		border: none;
+	}
+
+	.center-box .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.bottom-title {
+		line-height: 60upx;
+		font-size: 24upx;
+		padding: 15upx 0;
+	}
+
+	.bottom-content {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 35upx;
+	}
+
+	.bottom-content-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-bottom: 15upx;
+		width: 25%;
+		box-sizing: border-box;
+	}
+
+	.bottom-content-image {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 90upx;
+		height: 90upx;
+		overflow: hidden;
+		background: #007aff;
+		border-radius: 10upx;
+	}
+
+	.bottom-content-text {
+		font-size: 26upx;
+		color: #333;
+		margin-top: 10upx;
+	}
+
+	.bottom-btn {
+		height: 90upx;
+		line-height: 90upx;
+		border-top: 1px #f5f5f5 solid;
+	}
+
+	.bottom-content-image.wx {
+		background: #00ce47;
+	}
+
+	.bottom-content-image.qq {
+		background: #00b6f6;
+	}
+
+	.bottom-content-image.sina {
+		background: #ff766a;
+	}
+
+	.bottom-content-image.copy {
+		background: #07ccd0;
+	}
+
+	@font-face {
+		font-family: 'iconfont';
+		/* project id 1028200 */
+		src: url('https://at.alicdn.com/t/font_1028200_47ewtwy4t04.ttf') format('truetype');
+	}
+
+	.icon {
+		font-family: 'iconfont';
+		font-size: 40upx;
+		color: #fff;
+	}
+</style>

component/uni-popup.vue

@@ -0,0 +1,201 @@
+<template>
+	<view>
+		<view v-show="show" :style="{ top: offsetTop + 'px' }" class="uni-mask" @click="hide" @touchmove.stop.prevent="moveHandle" />
+		<view v-show="show" :class="'uni-popup-' + position + ' ' + 'uni-popup-' + mode" class="uni-popup">
+			{{ msg }}
+			<slot />
+			<view v-if="position === 'middle' && mode === 'insert'" :class="{
+          'uni-close-bottom': buttonMode === 'bottom',
+          'uni-close-right': buttonMode === 'right'
+        }" class=" uni-icon uni-icon-close" @click="closeMask" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniPopup',
+		props: {
+			/**
+			 * 页面显示
+			 */
+			show: {
+				type: Boolean,
+				default: false
+			},
+			/**
+			 * 对齐方式
+			 */
+			position: {
+				type: String,
+				// top - 顶部， middle - 居中, bottom - 底部
+				default: 'middle'
+			},
+			/**
+			 * 显示模式
+			 */
+			mode: {
+				type: String,
+				default: 'insert'
+			},
+			/**
+			 * 额外信息
+			 */
+			msg: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * h5遮罩是否到顶
+			 */
+			h5Top: {
+				type: Boolean,
+				default: false
+			},
+			buttonMode: {
+				type: String,
+				default: 'bottom'
+			}
+		},
+		data() {
+			return {
+				offsetTop: 0
+			}
+		},
+		watch: {
+			h5Top(newVal) {
+				if (newVal) {
+					this.offsetTop = 44
+				} else {
+					this.offsetTop = 0
+				}
+			}
+		},
+		created() {
+			let offsetTop = 0
+			// #ifdef H5
+			if (!this.h5Top) {
+				offsetTop = 44
+			} else {
+				offsetTop = 0
+			}
+			// #endif
+			this.offsetTop = offsetTop
+		},
+		methods: {
+			hide() {
+				if (this.mode === 'insert' && this.position === 'middle') return
+				this.$emit('hidePopup')
+			},
+			closeMask() {
+				if (this.mode === 'insert') {
+					this.$emit('hidePopup')
+				}
+			},
+			moveHandle() {}
+		}
+	}
+</script>
+<style>
+	.uni-mask {
+		position: fixed;
+		z-index: 998;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.uni-popup {
+		position: fixed;
+		z-index: 999;
+		background-color: #ffffff;
+	}
+
+	.uni-popup-middle {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.uni-popup-middle.uni-popup-insert {
+		min-width: 380upx;
+		min-height: 380upx;
+		max-width: 100%;
+		max-height: 80%;
+		transform: translate(-50%, -65%);
+		background: none;
+		box-shadow: none;
+	}
+
+	.uni-popup-middle.uni-popup-fixed {
+		border-radius: 10upx;
+		padding: 30upx;
+	}
+
+	.uni-close-bottom,
+	.uni-close-right {
+		position: absolute;
+		bottom: -180upx;
+		text-align: center;
+		border-radius: 50%;
+		color: #f5f5f5;
+		font-size: 60upx;
+		font-weight: bold;
+		opacity: 0.8;
+		z-index: -1;
+	}
+
+	.uni-close-bottom {
+		margin: auto;
+		left: 0;
+		right: 0;
+	}
+
+	.uni-close-right {
+		right: -60upx;
+		top: -80upx;
+	}
+
+	.uni-close-bottom:after {
+		content: '';
+		position: absolute;
+		width: 0px;
+		border: 1px #f5f5f5 solid;
+		top: -200upx;
+		bottom: 56upx;
+		left: 50%;
+		transform: translate(-50%, -0%);
+		opacity: 0.8;
+	}
+
+	.uni-popup-top,
+	.uni-popup-bottom {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.uni-popup-top {
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100upx;
+		line-height: 100upx;
+		text-align: center;
+	}
+
+	.uni-popup-bottom {
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		min-height: 100upx;
+		line-height: 100upx;
+		text-align: center;
+	}
+</style>

pages/index/hotel.vue

@@ -191,7 +191,23 @@
                     iScrolltop: 1
             }
         },
-        
+        onShareAppMessage(res) {
+        	uni.showShareMenu({
+        	     withShareTicket: true  
+        	});  
+        	let that = this;
+        	let id = this.goodId;  // 商品Id
+        	
+        	if (res.from === 'button') {
+              // 来自页面内分享按钮
+        		console.log(res.target)
+        	}
+        	return {
+        		title: that.hotelitle,
+        		path: `/pages/index/shop?id=${id}`,
+        		imageUrl:that.store_slide[0] 
+        	}
+        },
         // 初次渲染进来关闭分享菜单栏
         onReady:function(){
             // uni.hideShareMenu({

pages/index/index.vue

@@ -76,7 +76,17 @@
 		 定位失败暂时获取不到周边酒店信息哦
 	 </view>
      </scroll-view>
-
+     <!--首次登录领取圈币-->
+	<!-- <van-dialog
+	   use-slot
+	   :show="firstpoint" 
+	   show-cancel-button
+	   bind:close="onClose"
+	   bind:getuserinfo="getUserInfo"
+	 >
+	   <image src="https://img.yzcdn.cn/1.jpg" />
+	 </van-dialog> -->
+	 <unipopup :show="ishow"/>
 	</view>
 </template>
 
@@ -84,18 +94,22 @@
 	import {
 		mapMutations,mapState
 	} from 'vuex'
+	import unipopup from '@/component/popup.vue'
 	import uniNavBar from '@/component/uni-nav-bar/uni-nav-bar.vue'
 	import uniIcon from '@/component/uni-icon/uni-icon.vue'
 	import logionDialog from '@/component/loginDialog.vue'
 	import amap from '@/common/amap-wx.js'
 	export default {
 		components: {
+			unipopup,
 			uniNavBar,
 			uniIcon,
 			logionDialog
 		},
 		data() {
 			return {
+				ishow: true,
+				firstpoint: true,
 				page: 1,
 				ispull: true,
 				pagesize: 10,

pages/index/shop.vue

@@ -270,8 +270,29 @@
  			// })
  			//this.shareList = await this.$api.json('shareList');
  		},
-				
+		onShareAppMessage(res) {
+			uni.showShareMenu({
+			     withShareTicket: true  
+			});  
+			let that = this;
+			let id = this.goodId;  // 商品Id
+			let store_id = this.store_id;
+			if (res.from === 'button') {
+		      // 来自页面内分享按钮
+				console.log(res.target)
+			}
+			return {
+				title: that.datalist.goods_name,
+				path: `/pages/index/shop?id=${id}&store_id=${store_id}`,
+				imageUrl:that.nuberImg
+			}
+		},
+		onReady: function()  {
+			
+		},
  		methods:{
+			
+					
 			// 跳转到首页
 			goIndex() {
 				uni.switchTab({
@@ -388,7 +409,6 @@
 					     goods.push({});
 						 goods[0].goods_id = this.goods_id;
 						 goods[0].buy_num = this.shopnumber;
-					 let prices = this.datalist.goods_price*this.shopnumber;
 					 this.request({
 						 url:'/v1/order/save_og',
 						 method: 'post',
@@ -400,8 +420,9 @@
 							 console.log(res);
 							 let store = this.store_id;
 							 let order_id = res.data.data.order_id;
+							 this.specClass = 'none';
 							 uni.navigateTo({
-							   url: `/pages/index/sureBuy?store=${store}&prices=${prices}&order_id=${order_id}`
+							   url: `/pages/index/sureBuy?store=${store}&order_id=${order_id}`
 							 });
 							 
 						 }
@@ -835,7 +856,7 @@
  	.detail-desc{
  		background: #fff;
  		margin-top: 16upx;
-		margin-bottom: 20rpx;
+		margin-bottom: 135rpx;
 		width: 100%;
  		.d-header{
  			display: flex;

pages/index/sureBuy.vue

@@ -111,8 +111,8 @@
 		
 		 
 		 <van-cell v-if="radio === 1&&choseadress == '' " @click="goAdress" class="LinkAdress" title="选择地址"  is-link/>
-		  <view v-if="radio === 1&&choseadress != ''" class="wrapper">
-		  	<view class="u-box" @click="goAdress" >
+		  <view v-if="radio === 1&&choseadress != ''" @click="goAdress" class="wrapper">
+		  	<view class="u-box" >
 		  		<text class="name" style="padding-right: 20upx;">{{choseadress.address_realname}}</text>
 		  		<text class="mobile">{{choseadress.address_mob_phone}}</text>
 		  	</view>
@@ -194,10 +194,11 @@
 			console.log(options);
 			this.order_id = options.order_id;
 			this.store_id = options.store;
-			let prices =  Number((options.prices/100).toFixed(2));
-			this.prices = prices; 
+			// let prices =  Number((options.prices/100).toFixed(2));
+			// this.prices = prices; 
 			this.getorder(); // 获取订单详情
 			 uni.$on("getadress",(adress)=>{
+				    console.log(adress);
 			        this.choseadress = adress;
 					this.address_id = this.choseadress.address_id;
 					this.getralodprice();
@@ -248,14 +249,18 @@
 					success: (res) => {
 						let { data } = res.data;
 						this.store = data.store;
+						let totalprice = 0;
 						data.og_list.forEach(item => {
 						   let arr = item.goods_name.split(' ');
 						   item.desarray = arr[0];
 						   item.descire = item.goods_name.replace(arr[0], '');
+						   totalprice+=Number(item.goods_pay_price)*Number(item.goods_num);
 						})
+						console.log(totalprice);
 						this.hotelname = this.store.store_name
 						this.reserve = this.store.store_name
 						this.pricelist = data.og_list;
+						this.prices = totalprice;
 					}
 				})
 			},
@@ -366,7 +371,9 @@
 						address_id:　this.address_id
 					},
 					success:(res) => {
+						    let price = this.prices;
 						    this.ralodprice = res.data.data.shipping_fee;
+							this.prices = price + this.ralodprice;
 					}
 				})
 			},

pages/myCenter/Settled.vue

@@ -60,7 +60,6 @@
 				this.hotel_name = e.detail;
 			},
 			onChange(e) {
-			    console.log(e);
 				this.contacts_name = e.detail;
 			},
 			changenumber(e){
@@ -73,11 +72,9 @@
 				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;

pages/myCenter/index.vue

@@ -193,34 +193,43 @@
 		methods: {
 			// 跳转到我的订单
 			gomyorder(e) {
+		        console.log(e);
 				if(this.successlogion && this.hasLogin) {
+					let state = '';
 					if(e == 0) {
-						 ({
-							url: '/pages/myOrder/index'
+						state = 'all';
+						uni.$emit('getstate', state)
+						uni.switchTab({
+						   url: '/pages/myOrder/index'  // 我的消息通知
 						})
+						
 					}else if(e == 1) {
-						let state = 'waiting';
-						uni.navigateTo({
-							url: `/pages/myOrder/index?state=${state}`
+						 state = 'waiting';
+						 uni.$emit('getstate', state)
+						uni.switchTab({
+						   url: '/pages/myOrder/index'  // 我的消息通知
 						})
 						
 					}else if(e == 2) {
-						let state = 'payed'; 
-						uni.navigateTo({
-							url: `/pages/myOrder/index?state=${state}`
+						 state = 'payed'; 
+						 uni.$emit('getstate', state)
+						uni.switchTab({
+						   url: '/pages/myOrder/index'  // 我的消息通知
 						})
 					}else if(e == 3) {
-						let state = 'complete-';
+						 state = 'complete';
 						
 					}else if(e == 4) {
-						let state = 'cancel';
-						uni.navigateTo({
-							url: `/pages/myOrder/index?state=${state}`
+						 state = 'cancel';
+						 uni.$emit('getstate', state)
+						uni.switchTab({
+						   url: '/pages/myOrder/index'  // 我的消息通知
 						})
 					}else if(e == 5) {
-						let state = 'refund';
-						uni.navigateTo({
-							url: `/pages/myOrder/index?state=${state}`
+						 state = 'refund';
+						 uni.$emit('getstate', state)
+						uni.switchTab({
+						   url: '/pages/myOrder/index'  // 我的消息通知
 						})
 					}
 					

pages/myOrder/finsh.vue

@@ -22,6 +22,7 @@
 		methods:{
 			// ji xu gou wu
 			submitRemin() {
+				uni.$emit('finshlist')
 				uni.navigateBack({
 				    delta: 2
 				});

pages/myOrder/index.vue

@@ -119,8 +119,21 @@
 				  this.order_list = [];
 			      this.getlist();
 			  })
-			  // 完成评价  完成支付
+			  // 我的跳掉订单
+			  uni.$on('getstate', (e) => {
+				  console.log(e);
+				  console.log("ss")
+			  })
+			  // 完成支付
+			  uni.$on(" finshlist",()=>{
+				  this.page = 1;
+			  	  this.order_list = [];
+			      this.getlist();
+			   })
+			 
+			  // 完成评价 
 			  uni.$on("finshesitmate",()=>{
+				   this.page = 1;
 				   this.order_list = [];
 			       this.getlist();
 			   })

pages/myOrder/order.vue

@@ -25,15 +25,15 @@
 		  <span style="padding-left: 16upx;">{{detail.store_name}}</span>
 	   </view>
 	
-	 <view class="shoplist">
+	 <view class="shoplist" v-for="(items,index) in detail.goods" :key="index">
 			  <view>
 				  <van-card
 					title-class="changewidth"
 					price-class ="priceClass"
-					price="10.00"
-					desc="描述信息"
-					title="商品标题"
-					thumb="https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg"
+					:price="items.goods_price"
+					:desc="items.descire"
+					:title="items.desarray"
+					:thumb="pictureUrl + '/uploads/home/store/goods/'+items.goods_image.substr(0, items.goods_image.indexOf('\_')) + '/' + items.goods_image"
 				  >
 				  </van-card>
 			  </view>
@@ -50,11 +50,11 @@
 		     <text class="time"  v-else>{{detail.payment_time}}</text>
 		 </view>
 		 <view>商家发货: 
-		   <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0">未发货</text>
+		   <text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0 ||  detail.order_state == 20">未发货</text>
 		   <text class="time"  v-else>{{detail.shipping_time}}</text>
 		 </view>
 		 <view>确认收货: 
-			<text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0">未确认</text>
+			<text class="time"  v-if="detail.order_state == 10 || detail.order_state == 0||  detail.order_state == 20">未确认</text>
 			<text class="time"  v-else>{{detail.finnshed_time}}</text>
 		 </view>
 	 </view>
@@ -118,7 +118,13 @@
 						order_id: this.id
 					},
 					success: (res) => {
-						this.detail = res.data.data;
+						let { data } = res.data;
+						data.goods.forEach((items,index) => {
+								let arr = items.goods_name.split(' ');
+								items.desarray = arr[0];
+								items.descire = items.goods_name.replace(arr[0], '');
+						})
+						this.detail = data;
 						console.log(this.detail);
 					}
 				})
@@ -184,8 +190,6 @@
 				let prices = this.detail.order_amount;
 				let order_id = this.id;
 				let isform = 1;
-			
-				return;
 				uni.navigateTo({
 					url:`/pages/myOrder/paymoment?order_id=${order_id}
 					&prices=${prices}&isform=${isform}`
@@ -265,6 +269,7 @@
 		color: #606266;
 		border-top: 16upx solid #F5F5F5;
 		padding-bottom: 32upx;
+		margin-bottom: 100upx;
 		view {
 			padding: 32upx 0 0 0;
 		}

pages/myOrder/paymoment.vue

@@ -110,12 +110,17 @@
 					success: (res) => {
 						console.log(res);
 						//uni.$emit('finshesitmate');
-						setTimeout(()=> {
-							uni.navigateTo({
-								url: `/pages/myOrder/finsh?isform=${this.isform}&order_id=${this.order_id}`
-							})
-							//uni.navigateBack()
-						}, 2000)
+						console.log(res.data.code)
+						console.log(res.data.data);
+						if(res.data.code == 1000) {
+							setTimeout(()=> {
+								uni.navigateTo({
+									url: `/pages/myOrder/finsh?isform=${this.isform}&order_id=${this.order_id}`
+								})
+								//uni.navigateBack()
+							}, 2000)
+						}
+						
 					}
 				})
 			},

pages/myone/oneIndex.vue

@@ -17,7 +17,7 @@
 			<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="item.article_thumb"/>
+						 <image  style="width: 214upx;height: 152upx;" :src=" pictureUrl + '/' + item.article_thumb"/>
 					 </view>
 					 <view class="hotelright">
 						<view style="font-size: 28upx;color: #303133;">{{item.article_title}}</view>
@@ -39,6 +39,7 @@
 		},
 		data() {
 			return {
+				pictureUrl: this.pictureUrl,
 				page: 1,
 				page_size: 10,
 				ac_id:'',
@@ -94,12 +95,9 @@
 					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);
 					}
 				})
 			},

pages/myone/onedetail.vue

@@ -13,7 +13,6 @@
 		    }
 		},
 		onLoad(a) {
-			console.log(a);
 			this.article_id = a.id;
 			let name = a.name;
 			uni.setNavigationBarTitle({

unpackage/dist/build/mp-weixin/app.json

@@ -68,6 +68,5 @@
     "van-dialog": "/wxcomponents/dist/dialog/index",
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
-  },
-  "sitemapLocation": "sitemap.json"
+  }
 }

unpackage/dist/build/mp-weixin/component/shopList.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/shopList"],{"5cf7":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{productList:{type:Array}},data:function(){return{title:"product-list",renderImage:!1,pictureUrl:this.pictureUrl}},methods:{goshop:function(n){console.log(n);var o=n.goods_commonid,e=n.store_id;t.navigateTo({url:"/pages/index/shop?id=".concat(o,"&store_id=").concat(e)})}},onLoad:function(){},onPullDownRefresh:function(){},onReachBottom:function(){}};n.default=o}).call(this,o("543d")["default"])},"989b":function(t,n,o){"use strict";o.r(n);var e=o("a948"),c=o("d4f4");for(var u in c)"default"!==u&&function(t){o.d(n,t,(function(){return c[t]}))}(u);o("f2ca");var r,a=o("f0c5"),i=Object(a["a"])(c["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],r);n["default"]=i.exports},a01a:function(t,n,o){},a948:function(t,n,o){"use strict";var e,c=function(){var t=this,n=t.$createElement;t._self._c},u=[];o.d(n,"b",(function(){return c})),o.d(n,"c",(function(){return u})),o.d(n,"a",(function(){return e}))},d4f4:function(t,n,o){"use strict";o.r(n);var e=o("5cf7"),c=o.n(e);for(var u in e)"default"!==u&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=c.a},f2ca:function(t,n,o){"use strict";var e=o("a01a"),c=o.n(e);c.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["component/shopList"],{"5cf7":function(t,n,o){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var o={props:{productList:{type:Array}},data:function(){return{title:"product-list",renderImage:!1,pictureUrl:this.pictureUrl}},methods:{goshop:function(n){console.log(n);var o=n.goods_commonid,e=n.store_id;t.navigateTo({url:"/pages/index/shop?id=".concat(o,"&store_id=").concat(e)})}},onLoad:function(){},onPullDownRefresh:function(){},onReachBottom:function(){}};n.default=o}).call(this,o("543d")["default"])},"989b":function(t,n,o){"use strict";o.r(n);var e=o("b129"),r=o("d4f4");for(var u in r)"default"!==u&&function(t){o.d(n,t,(function(){return r[t]}))}(u);o("f2ca");var a,c=o("f0c5"),i=Object(c["a"])(r["default"],e["b"],e["c"],!1,null,null,null,!1,e["a"],a);n["default"]=i.exports},a01a:function(t,n,o){},b129:function(t,n,o){"use strict";var e,r=function(){var t=this,n=t.$createElement,o=(t._self._c,t.__map(t.productList,(function(n,o){var e=n.goods_image.substr(0,n.goods_image.indexOf("_"));return{$orig:t.__get_orig(n),g0:e}})));t.$mp.data=Object.assign({},{$root:{l0:o}})},u=[];o.d(n,"b",(function(){return r})),o.d(n,"c",(function(){return u})),o.d(n,"a",(function(){return e}))},d4f4:function(t,n,o){"use strict";o.r(n);var e=o("5cf7"),r=o.n(e);for(var u in e)"default"!==u&&function(t){o.d(n,t,(function(){return e[t]}))}(u);n["default"]=r.a},f2ca:function(t,n,o){"use strict";var e=o("a01a"),r=o.n(e);r.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'component/shopList-create-component',
     {

unpackage/dist/build/mp-weixin/component/shopList.wxml

@@ -1 +1 @@
-<view class="page"><view class="uni-product-list"><block wx:for="{{productList}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" class="uni-product" bindtap="__e"><view class="image-view"><image class="uni-product-image" style="background-color:#007AFF;" src="{{pictureUrl+'/uploads/home/store/'+product.goods_image}}"></image></view><view class="uni-product-title textover">{{product.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"￥"+product.goods_marketprice}}</text><text class="uni-product-price-favour">{{"￥"+product.goods_costprice}}</text></view></view></block></view></view>
+<view class="page"><view class="uni-product-list"><block wx:for="{{$root.l0}}" wx:for-item="product" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['goshop',['$0'],[[['productList','',index]]]]]]]}}" class="uni-product" bindtap="__e"><view class="image-view"><image class="uni-product-image" src="{{pictureUrl+'/uploads/home/store/goods/'+product.g0+'/'+product.$orig.goods_image}}"></image></view><view class="uni-product-title textover">{{product.$orig.goods_name}}</view><view class="uni-product-price"><text class="uni-product-price-original">{{"￥"+product.$orig.goods_marketprice}}</text><text class="uni-product-price-favour">{{"￥"+product.$orig.goods_costprice}}</text></view></view></block></view></view>

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

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myCenter/definite"],{"1a20":function(t,n,e){"use strict";var o,i=function(){var t=this,n=t.$createElement;t._self._c},a=[];e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return a})),e.d(n,"a",(function(){return o}))},"25a0":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={onReady:function(){console.log("进来了"),t.setNavigationBarColor({frontColor:"#ffffff",backgroundColor:"#D9332E",animation:{duration:400,timingFunc:"easeIn"}})},data:function(){return{page:1,point_list:[],userinfo:{}}},onLoad:function(){this.getuserinfo(),this.getlist()},methods:{getuserinfo:function(){var t=this;this.request({url:"/v2/member/info",method:"GET",success:function(n){var e=n.data.data;t.userinfo=e}})},getlist:function(){var t=this;this.request({url:"/v2/member/points",method:"post",data:{page:this.page,page_size:10},success:function(n){console.log(n),t.point_list=n.data.data.point_list}})}}};n.default=e}).call(this,e("543d")["default"])},3963:function(t,n,e){"use strict";var o=e("7b37"),i=e.n(o);i.a},5097:function(t,n,e){"use strict";e.r(n);var o=e("1a20"),i=e("7c94");for(var a in i)"default"!==a&&function(t){e.d(n,t,(function(){return i[t]}))}(a);e("3963");var u,r=e("f0c5"),c=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],u);n["default"]=c.exports},"7b37":function(t,n,e){},"7c94":function(t,n,e){"use strict";e.r(n);var o=e("25a0"),i=e.n(o);for(var a in o)"default"!==a&&function(t){e.d(n,t,(function(){return o[t]}))}(a);n["default"]=i.a},bc9c:function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");o(e("66fd"));var n=o(e("5097"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])}},[["bc9c","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myCenter/definite"],{"25a0":function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={onReady:function(){console.log("进来了"),t.setNavigationBarColor({frontColor:"#ffffff",backgroundColor:"#D9332E",animation:{duration:400,timingFunc:"easeIn"}})},data:function(){return{page:1,point_list:[],userinfo:{}}},onLoad:function(){this.getuserinfo(),this.getlist()},methods:{getuserinfo:function(){var t=this;this.request({url:"/v2/member/info",method:"GET",success:function(n){var e=n.data.data;t.userinfo=e}})},getlist:function(){var t=this;this.request({url:"/v2/member/points",method:"post",data:{page:this.page,page_size:10},success:function(n){console.log(n),t.point_list=n.data.data.point_list}})}}};n.default=e}).call(this,e("543d")["default"])},"34fb":function(t,n,e){"use strict";var o,i=function(){var t=this,n=t.$createElement;t._self._c},u=[];e.d(n,"b",(function(){return i})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){return o}))},3963:function(t,n,e){"use strict";var o=e("7b37"),i=e.n(o);i.a},5097:function(t,n,e){"use strict";e.r(n);var o=e("34fb"),i=e("7c94");for(var u in i)"default"!==u&&function(t){e.d(n,t,(function(){return i[t]}))}(u);e("3963");var a,r=e("f0c5"),c=Object(r["a"])(i["default"],o["b"],o["c"],!1,null,null,null,!1,o["a"],a);n["default"]=c.exports},"7b37":function(t,n,e){},"7c94":function(t,n,e){"use strict";e.r(n);var o=e("25a0"),i=e.n(o);for(var u in o)"default"!==u&&function(t){e.d(n,t,(function(){return o[t]}))}(u);n["default"]=i.a},bc9c:function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");o(e("66fd"));var n=o(e("5097"));function o(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])}},[["bc9c","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/myCenter/definite.wxss

@@ -1 +1 @@
-.money{height:140rpx;color:#fff;text-align:center;background-color:#d9332e;font-size:28rpx}.money .moneysize{font-size:42rpx;padding-top:25rpx}
+.money{height:140rpx;color:#fff;text-align:center;background-color:#d9332e;font-size:28rpx;padding:20rpx 0 40rpx 0}.money .moneysize{font-size:42rpx;padding-top:25rpx}

unpackage/dist/build/mp-weixin/pages/myCenter/logion.wxml

@@ -1 +1 @@
-<view><view><view style="text-align:center;margin:100rpx;font-size:36rpx;">欢迎回来</view><view style="width:50%;margin:0 auto;"><button open-type="getUserInfo" data-event-opts="{{[['tap',[['wxlogion',['$event']]]]]}}" bindtap="__e">授权登录</button></view></view></view>
+<view><block wx:if="{{!hasLogin}}"><view><view style="text-align:center;margin:100rpx;font-size:36rpx;">欢迎回来</view><view style="width:50%;margin:0 auto;"><button type="primary" open-type="getUserInfo" data-event-opts="{{[['tap',[['wxlogion',['$event']]]]]}}" bindtap="__e">授权登录</button></view></view></block><block wx:if="{{hasLogin&&!successlogion}}"><view><view style="text-align:center;margin:100rpx;font-size:36rpx;">获取您手机号码权限</view><view style="width:50%;margin:0 auto;"><button type="primary" open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['decryptPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e">手机号登录</button></view></view></block></view>

unpackage/dist/build/mp-weixin/pages/myOrder/finsh.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myOrder/finsh"],{2639:function(n,t,e){"use strict";e.r(t);var r=e("d1cf"),u=e.n(r);for(var o in r)"default"!==o&&function(n){e.d(t,n,(function(){return r[n]}))}(o);t["default"]=u.a},"4c89":function(n,t,e){"use strict";var r,u=function(){var n=this,t=n.$createElement;n._self._c},o=[];e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return r}))},"7df0":function(n,t,e){"use strict";e.r(t);var r=e("4c89"),u=e("2639");for(var o in u)"default"!==o&&function(n){e.d(t,n,(function(){return u[n]}))}(o);var a,c=e("f0c5"),i=Object(c["a"])(u["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],a);t["default"]=i.exports},8016:function(n,t,e){"use strict";(function(n){e("0bef"),e("921b");r(e("66fd"));var t=r(e("7df0"));function r(n){return n&&n.__esModule?n:{default:n}}n(t.default)}).call(this,e("543d")["createPage"])},d1cf:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{order_id:""}},onLoad:function(n){this.order_id=n.order_id},methods:{submitRemin:function(){n.navigateBack({delta:2})},lookfor:function(){var t=this.order_id;n.navigateTo({url:"/pages/myOrder/order?id=".concat(t)})}}};t.default=e}).call(this,e("543d")["default"])}},[["8016","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myOrder/finsh"],{2639:function(t,n,e){"use strict";e.r(n);var r=e("d1cf"),u=e.n(r);for(var o in r)"default"!==o&&function(t){e.d(n,t,(function(){return r[t]}))}(o);n["default"]=u.a},"7df0":function(t,n,e){"use strict";e.r(n);var r=e("bccf"),u=e("2639");for(var o in u)"default"!==o&&function(t){e.d(n,t,(function(){return u[t]}))}(o);var c,i=e("f0c5"),a=Object(i["a"])(u["default"],r["b"],r["c"],!1,null,null,null,!1,r["a"],c);n["default"]=a.exports},8016:function(t,n,e){"use strict";(function(t){e("0bef"),e("921b");r(e("66fd"));var n=r(e("7df0"));function r(t){return t&&t.__esModule?t:{default:t}}t(n.default)}).call(this,e("543d")["createPage"])},bccf:function(t,n,e){"use strict";var r,u=function(){var t=this,n=t.$createElement;t._self._c},o=[];e.d(n,"b",(function(){return u})),e.d(n,"c",(function(){return o})),e.d(n,"a",(function(){return r}))},d1cf:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{order_id:""}},onLoad:function(t){this.order_id=t.order_id},methods:{submitRemin:function(){t.$emit("finshlist"),t.navigateBack({delta:2})},lookfor:function(){var n=this.order_id;t.navigateTo({url:"/pages/myOrder/order?id=".concat(n)})}}};n.default=e}).call(this,e("543d")["default"])}},[["8016","common/runtime","common/vendor"]]]);

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

@@ -1 +1 @@
-page{background-color:#f5f5f5}.cart-list{background-color:#fff}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;padding:20rpx 36rpx}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important}.priceClass{color:#303133!important;font-weight:100!important;font-size:36rpx}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.adress{padding:35rpx 36rpx;border-bottom:14rpx solid #f5f5f5}.adressDetail{padding:6rpx 0}.orderCode{padding-left:15rpx;font-weight:500}.adressbottom{padding:0 36rpx;color:#606266;border-top:16rpx solid #f5f5f5;padding-bottom:32rpx}.adressbottom view{padding:32rpx 0 0 0}.adressbottom .time{padding-left:16rpx}.adressbutton{position:fixed;bottom:0;width:100%}.adressbutton .buttonStatus{display:-webkit-box;display:-webkit-flex;display:flex;text-align:center}.adressbutton .buttonStatus .deleteOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#303133;font-size:32rpx;background-color:#fff;padding:10px 0}.adressbutton .buttonStatus .payOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#fff;background-color:#d9332e;padding:10px 0}
+page{background-color:#f5f5f5}.cart-list{background-color:#fff}.topTip{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start;padding:20rpx 36rpx}.changewidth{color:#303133;font-size:32rpx;font-weight:100!important}.priceClass{color:#303133!important;font-weight:100!important;font-size:36rpx}.van-card{background-color:#fff!important}.shoplist{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.adress{padding:35rpx 36rpx;border-bottom:14rpx solid #f5f5f5}.adressDetail{padding:6rpx 0}.orderCode{padding-left:15rpx;font-weight:500}.adressbottom{padding:0 36rpx;color:#606266;border-top:16rpx solid #f5f5f5;padding-bottom:32rpx;margin-bottom:100rpx}.adressbottom view{padding:32rpx 0 0 0}.adressbottom .time{padding-left:16rpx}.adressbutton{position:fixed;bottom:0;width:100%}.adressbutton .buttonStatus{display:-webkit-box;display:-webkit-flex;display:flex;text-align:center}.adressbutton .buttonStatus .deleteOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#303133;font-size:32rpx;background-color:#fff;padding:10px 0}.adressbutton .buttonStatus .payOrder{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:32rpx;color:#fff;background-color:#d9332e;padding:10px 0}

unpackage/dist/build/mp-weixin/pages/myone/oneIndex.wxml

@@ -1 +1 @@
-<view><view class="searchType" style="background:#fff;"><view class="input-view"><uni-icon vue-id="24146ccc-1" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="搜索文章" data-event-opts="{{[['confirm',[['confirm',['$event']]]]]}}" bindconfirm="__e"/></view></view><view><van-tabs vue-id="24146ccc-2" active="{{active}}" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{typelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><van-tab vue-id="{{('24146ccc-3-'+index)+','+('24146ccc-2')}}" name="{{index}}" title="{{item.ac_name}}" data-com-type="wx" bind:__l="__l"></van-tab></block></van-tabs></view><scroll-view class="floor-list" style="height:90vh;" scroll-top="{{scrollTop}}" scroll-y="true" refresher-enabled="true" data-event-opts="{{[['scroll',[['scroll',['$event']]]],['scrolltoupper',[['upper',['$event']]]],['scrolltolower',[['lower',['$event']]]]]}}" bindscroll="__e" bindscrolltoupper="__e" bindscrolltolower="__e"><block wx:for="{{acrelist}}" wx:for-item="item" wx:for-index="indedx" wx:key="indedx"><view data-event-opts="{{[['tap',[['goIndex',['$0'],[[['acrelist','',indedx]]]]]]]}}" bindtap="__e"><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src="{{item.article_thumb}}"></image></view><view class="hotelright"><view style="font-size:28rpx;color:#303133;">{{item.article_title}}</view><view>{{''+item.article_time+''}}</view></view></view></view></block></scroll-view></view>
+<view><view class="searchType" style="background:#fff;"><view class="input-view"><uni-icon vue-id="24146ccc-1" type="search" size="22" color="#666666" bind:__l="__l"></uni-icon><input class="input" confirm-type="search" type="text" placeholder="搜索文章" data-event-opts="{{[['confirm',[['confirm',['$event']]]]]}}" bindconfirm="__e"/></view></view><view><van-tabs vue-id="24146ccc-2" active="{{active}}" data-event-opts="{{[['^change',[['onChange']]]]}}" data-com-type="wx" bind:change="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{typelist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><van-tab vue-id="{{('24146ccc-3-'+index)+','+('24146ccc-2')}}" name="{{index}}" title="{{item.ac_name}}" data-com-type="wx" bind:__l="__l"></van-tab></block></van-tabs></view><scroll-view class="floor-list" style="height:90vh;" scroll-top="{{scrollTop}}" scroll-y="true" refresher-enabled="true" data-event-opts="{{[['scroll',[['scroll',['$event']]]],['scrolltoupper',[['upper',['$event']]]],['scrolltolower',[['lower',['$event']]]]]}}" bindscroll="__e" bindscrolltoupper="__e" bindscrolltolower="__e"><block wx:for="{{acrelist}}" wx:for-item="item" wx:for-index="indedx" wx:key="indedx"><view data-event-opts="{{[['tap',[['goIndex',['$0'],[[['acrelist','',indedx]]]]]]]}}" bindtap="__e"><view class="hotelList"><view class="hotleLeft"><image style="width:214rpx;height:152rpx;" src="{{pictureUrl+'/'+item.article_thumb}}"></image></view><view class="hotelright"><view style="font-size:28rpx;color:#303133;">{{item.article_title}}</view><view>{{''+item.article_time+''}}</view></view></view></view></block></scroll-view></view>

unpackage/dist/build/mp-weixin/pages/myone/onedetail.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myone/onedetail"],{"085c":function(t,e,n){"use strict";n.r(e);var a=n("4d38"),i=n("af92");for(var c in i)"default"!==c&&function(t){n.d(e,t,(function(){return i[t]}))}(c);var u,r=n("f0c5"),o=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);e["default"]=o.exports},"4d38":function(t,e,n){"use strict";var a,i=function(){var t=this,e=t.$createElement;t._self._c},c=[];n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return a}))},"76ba":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{article_id:"",nodes:""}},onLoad:function(e){console.log(e),this.article_id=e.id;var n=e.name;t.setNavigationBarTitle({title:n}),this.getactrile()},methods:{getactrile:function(){var t=this;this.request({url:"/v1/entry/news_desc",method:"post",data:{article_id:this.article_id},success:function(e){t.nodes=e.data.data.article_content}})}}};e.default=n}).call(this,n("543d")["default"])},af92:function(t,e,n){"use strict";n.r(e);var a=n("76ba"),i=n.n(a);for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);e["default"]=i.a},b33d:function(t,e,n){"use strict";(function(t){n("0bef"),n("921b");a(n("66fd"));var e=a(n("085c"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])}},[["b33d","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/myone/onedetail"],{"085c":function(t,e,n){"use strict";n.r(e);var a=n("c784"),i=n("af92");for(var c in i)"default"!==c&&function(t){n.d(e,t,(function(){return i[t]}))}(c);var u,r=n("f0c5"),o=Object(r["a"])(i["default"],a["b"],a["c"],!1,null,null,null,!1,a["a"],u);e["default"]=o.exports},"76ba":function(t,e,n){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n={data:function(){return{article_id:"",nodes:""}},onLoad:function(e){this.article_id=e.id;var n=e.name;t.setNavigationBarTitle({title:n}),this.getactrile()},methods:{getactrile:function(){var t=this;this.request({url:"/v1/entry/news_desc",method:"post",data:{article_id:this.article_id},success:function(e){t.nodes=e.data.data.article_content}})}}};e.default=n}).call(this,n("543d")["default"])},af92:function(t,e,n){"use strict";n.r(e);var a=n("76ba"),i=n.n(a);for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);e["default"]=i.a},b33d:function(t,e,n){"use strict";(function(t){n("0bef"),n("921b");a(n("66fd"));var e=a(n("085c"));function a(t){return t&&t.__esModule?t:{default:t}}t(e.default)}).call(this,n("543d")["createPage"])},c784:function(t,e,n){"use strict";var a,i=function(){var t=this,e=t.$createElement;t._self._c},c=[];n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return a}))}},[["b33d","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/project.config.json

@@ -4,24 +4,8 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		}
+		"urlCheck": true,
+		"es6": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.9.2",

unpackage/dist/dev/mp-weixin/app.json

@@ -69,5 +69,5 @@
     "van-rate": "/wxcomponents/dist/rate/index",
     "van-cell": "/wxcomponents/dist/cell/index"
   },
-  "sitemapLocation": "sitemap75.json"
+  "sitemapLocation": "sitemap68.json"
 }

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

@@ -104,11 +104,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"component/uni-icon/uni-icon":1,"component/uni-nav-bar/uni-nav-bar":1,"component/assess":1,"component/commoNar":1,"component/shopList":1,"component/uinNumberCart":1,"component/uinNumber":1,"component/textarea":1,"component/uploadImage":1,"component/Dialog":1,"component/mpvue-citypicker/mpvueCityPicker":1,"component/uni-status-bar/uni-status-bar":1};
+/******/ 		var cssChunks = {"component/popup":1,"component/uni-icon/uni-icon":1,"component/uni-nav-bar/uni-nav-bar":1,"component/assess":1,"component/commoNar":1,"component/shopList":1,"component/uinNumberCart":1,"component/uinNumber":1,"component/textarea":1,"component/uploadImage":1,"component/Dialog":1,"component/mpvue-citypicker/mpvueCityPicker":1,"component/uni-popup":1,"component/uni-status-bar/uni-status-bar":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"component/loginDialog":"component/loginDialog","component/uni-icon/uni-icon":"component/uni-icon/uni-icon","component/uni-nav-bar/uni-nav-bar":"component/uni-nav-bar/uni-nav-bar","component/assess":"component/assess","component/commoNar":"component/commoNar","component/shopList":"component/shopList","component/uinNumberCart":"component/uinNumberCart","component/uinNumber":"component/uinNumber","component/textarea":"component/textarea","component/uploadImage":"component/uploadImage","component/Dialog":"component/Dialog","component/mpvue-citypicker/mpvueCityPicker":"component/mpvue-citypicker/mpvueCityPicker","component/uni-status-bar/uni-status-bar":"component/uni-status-bar/uni-status-bar"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"component/loginDialog":"component/loginDialog","component/popup":"component/popup","component/uni-icon/uni-icon":"component/uni-icon/uni-icon","component/uni-nav-bar/uni-nav-bar":"component/uni-nav-bar/uni-nav-bar","component/assess":"component/assess","component/commoNar":"component/commoNar","component/shopList":"component/shopList","component/uinNumberCart":"component/uinNumberCart","component/uinNumber":"component/uinNumber","component/textarea":"component/textarea","component/uploadImage":"component/uploadImage","component/Dialog":"component/Dialog","component/mpvue-citypicker/mpvueCityPicker":"component/mpvue-citypicker/mpvueCityPicker","component/uni-popup":"component/uni-popup","component/uni-status-bar/uni-status-bar":"component/uni-status-bar/uni-status-bar"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

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

@@ -2763,7 +2763,7 @@ var request = function request(options) {
   try {
     // 获取放入缓存的字段token obj.header["token"] = userToken;
     // const token = uni.getStorageSync('sessionId');
-    var token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU4OTMzNTEyOCwiZXhwIjoxNTkwMTk5MTI4LCJuYmYiOjE1ODkzMzUxMjgsInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.Uec3pKa_Btj0u_6qR95YK_MzyhL9gEcczRd3FpG9xUg';
+    var token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvd3d3LnF6YWl3YW5nLmNvbSIsImlhdCI6MTU5MDIwMTk3OSwiZXhwIjoxNTkxMDY1OTc5LCJuYmYiOjE1OTAyMDE5NzksInN1YiI6MTYsInBydiI6ImU5YTM5YzhhZjYwMWYyNGMzZjA3ZjQ0NjMyMmE1NmM4MDVjNWNkZTYifQ.lYkvBvJ3rh2NRLyii6aCe625YfzOpuCPNnpVY1jw_gA';
     if (token) {// 如果存在token 配置请求头
       options.header = {
         'X-TOKEN': token,
@@ -8886,7 +8886,7 @@ module.exports = g;
 
 /***/ }),
 
-/***/ 321:
+/***/ 328:
 /*!***************************************************************************!*\
   !*** D:/uinapp/myuinapp/component/mpvue-citypicker/city-data/province.js ***!
   \***************************************************************************/
@@ -9036,7 +9036,7 @@ provinceData;exports.default = _default;
 
 /***/ }),
 
-/***/ 322:
+/***/ 329:
 /*!***********************************************************************!*\
   !*** D:/uinapp/myuinapp/component/mpvue-citypicker/city-data/city.js ***!
   \***********************************************************************/
@@ -10550,7 +10550,7 @@ cityData;exports.default = _default;
 
 /***/ }),
 
-/***/ 323:
+/***/ 330:
 /*!***********************************************************************!*\
   !*** D:/uinapp/myuinapp/component/mpvue-citypicker/city-data/area.js ***!
   \***********************************************************************/

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

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["component/loginDialog"],{
 
-/***/ 257:
+/***/ 264:
 /*!****************************************************!*\
   !*** 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& */ 258);
-/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 260);
+/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 265);
+/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 267);
 /* 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"
 
 /***/ }),
 
-/***/ 258:
+/***/ 265:
 /*!***********************************************************************************!*\
   !*** 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& */ 259);
+/* 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& */ 266);
 /* 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__);
 
 /***/ }),
 
-/***/ 259:
+/***/ 266:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 260:
+/***/ 267:
 /*!*****************************************************************************!*\
   !*** 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& */ 261);
+/* 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& */ 268);
 /* 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); 
 
 /***/ }),
 
-/***/ 261:
+/***/ 268:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=script&lang=js& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -199,7 +199,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
     'component/loginDialog-create-component',
     {
         'component/loginDialog-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('1')['createComponent'](__webpack_require__(257))
+            __webpack_require__('1')['createComponent'](__webpack_require__(264))
         })
     },
     [['component/loginDialog-create-component']]