请求头分装

App.vue

@@ -17,7 +17,7 @@
 				uni.checkSession({
 					   success(){  
 					     console.log("登录未过期")  
-						 that.setOpenid("22222");
+						 that.setOpenid(sessionId);
 					    },  
 					
 						fail(){  
@@ -26,6 +26,8 @@
 					     uni.login({
 					     		provider: 'weixin',
 					     		success: function(res) {
+								   console.log(res);
+								   console.log(sessionId)
 					     		  // 获取code  
 					     			 that.setOpenid("22222");
 					     			 that.login();

component/Dialog.vue

@@ -24,10 +24,10 @@
     },
 	watch:{
 		'orderCancel':function(val) {
-			console.log("监听中")
 			if(val) {
 				this.showdialog = true;
-				console.log(this.showdialog)
+			}else {
+				this.showdialog = false;
 			}
 		}
 	},
@@ -38,8 +38,6 @@
       cancelDialog() {
         this.show = false;
         this.$emit('colseDialog')
-        console.log("取消")
-        console.log(this.orderCancel);
       },
       confirmOrder() {
         this.show = false;

component/loginDialog.vue

@@ -0,0 +1,72 @@
+<template>
+	<view>
+		<van-dialog  title="请登录"
+		show-cancel-button="true"
+		: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
+		  }
+		},
+		 data() {
+			return{
+				show: false
+			}
+		},
+		watch:{
+			'showdialog':function(val) {
+				if(val) {
+					this.show = true;
+				}else {
+					this.show = false;
+				}
+			}
+		},
+		methods:{
+			...mapMutations(['login','showDialog']),
+			cancelDialog() {
+				this.$msg('登录失败');
+				this.login();
+				this.$emit('cancelDiaolog')
+				this.showDialog(false);
+			},
+			confirmOrder() {
+				this.wxlogion();
+			},
+			wxlogion() {
+				let  that = this;
+				    uni.getUserInfo({
+					     success(res) {
+							 that.login(res.userInfo);
+							 that.showDialog(true);
+							 that.$emit('confirmDiaolog');
+							 that.$msg("登录成功")
+					     },
+					     fail(res) {
+						    console.log(res);
+							that.$msg("登录失败")
+					     }
+				    })
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

main.js

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

pages.json

@@ -70,10 +70,8 @@
 			"path": "pages/index/searchresult",
 			"style": {
 				"navigationBarTitleText": "搜索",
-				// "navigationStyle":"custom",
 				"usingComponents":{
-					"van-search": "/wxcomponents/dist/search/index",
-					"van-cell": "/wxcomponents/dist/cell/index"
+					"van-search": "/wxcomponents/dist/search/index"
 			    }
 			}
 		},
@@ -107,7 +105,6 @@
 			"style": {
 				"navigationBarTitleText": "确认订单",
 				"usingComponents": {
-				  "van-cell": "/wxcomponents/dist/cell/index",
 				  "van-cell-group": "/wxcomponents/dist/cell-group/index",
 				  "van-radio": "/wxcomponents/dist/radio/index",
 				  "van-radio-group": "/wxcomponents/dist/radio-group/index",
@@ -123,7 +120,6 @@
 			"style": {
 				"navigationBarTitleText": "支付方式",
 				"usingComponents": {
-				  "van-cell": "/wxcomponents/dist/cell/index",
 				  "van-cell-group": "/wxcomponents/dist/cell-group/index",
 				  "van-radio": "/wxcomponents/dist/radio/index",
 				  "van-radio-group": "/wxcomponents/dist/radio-group/index"
@@ -186,10 +182,7 @@
 		{
 			"path": "pages/myCenter/index",
 			"style": {
-				"navigationBarTitleText": "我的",
-				"usingComponents": {
-				  "van-cell": "/wxcomponents/dist/cell/index"
-				}
+				"navigationBarTitleText": "我的"
 			}
 		},
 		{
@@ -217,7 +210,6 @@
 			"style": {
 				"navigationBarTitleText": "圈币明细", 
 				 "usingComponents": {
-				   "van-cell": "/wxcomponents/dist/cell/index",
 				   "van-cell-group": "/wxcomponents/dist/cell-group/index"
 				 }
 			}
@@ -227,7 +219,6 @@
 			"style": {
 				"navigationBarTitleText": "商务合作", 
 				 "usingComponents": {
-				   "van-cell": "/wxcomponents/dist/cell/index",
 				   "van-cell-group": "/wxcomponents/dist/cell-group/index"
 				 }
 			}
@@ -245,7 +236,6 @@
 				"usingComponents": {
 				  "van-tab": "/wxcomponents/dist/tab/index",
 				  "van-tabs": "/wxcomponents/dist/tabs/index",
-				  "van-cell": "/wxcomponents/dist/cell/index",
 				  "van-card": "/wxcomponents/dist/card/index"
 				  
 				}
@@ -254,10 +244,7 @@
 		{
 			"path": "pages/myCenter/information",
 			"style": {
-				"navigationBarTitleText": "消息通知",
-				"usingComponents": {
-			       "van-cell": "/wxcomponents/dist/cell/index"
-				}
+				"navigationBarTitleText": "消息通知"
 			}
 		}
     ],
@@ -287,7 +274,11 @@
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"usingComponents":{
+			 "van-dialog": "/wxcomponents/dist/dialog/index",
+			 "van-cell": "/wxcomponents/dist/cell/index"
+		}
 		
 	}
 }

pages/index/index.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
-		<!-- <userInfo /> -->
 	<!-- <view>
-		<view>点击授权{{showModal}}</view>
-		<button v-if="showModal" open-type="getUserInfo" @click="wxlogion">请点击授权</button>
+		<view>点击授权{{hasLogin}}</view>
+		<button @click="wxlogion"   open-type="getUserInfo">请点击授权</button>
 	 </view> -->
+	 <logionDialog @confirmDiaolog="confirmDiaolog"  @cancelDiaolog="cancelDiaolog" :showdialog="showdialog"/>
 	 <scroll-view  style="height: 100vh;" class="floor-list"
 	  :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 	  refresher-enabled="true">
@@ -77,13 +77,16 @@
 	} from 'vuex'
 	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'
 	export default {
 		components: {
 			uniNavBar,
-			uniIcon
+			uniIcon,
+			logionDialog
 		},
 		data() {
 			return {
+				showdialog: false,   // 点击确定显示弹窗
 			    background: ['color1', 'color2', 'color3'],
 				indicatorDots: true,
 				autoplay: true,
@@ -99,7 +102,7 @@
 		},
 		computed:{
 			...mapState([
-			  'showModal',
+			  'hasLogin',
 			  'userInfo'
 			]),
 		},
@@ -111,7 +114,28 @@
 	    },
 		methods: {
 			...mapMutations(['login','showDialog']),
-			goinfor() {
				uni.navigateTo({
					url: '../myCenter/information'  // 我的收藏
				})
			},
+			goinfor() {
+				console.log(this.hasLogin);
+				console.log(this.userInfo);
+				if(this.hasLogin) {
+					uni.navigateTo({
+					   url: '../myCenter/information'  // 我的收藏
+					})
+					
+				}else {
+					this.showdialog = true;
+				}
				
			},
+			// 关闭弹窗
+			cancelDiaolog() {
+				this.showdialog = false;
+			},
+			// 确定
+			confirmDiaolog() {
+				this.showdialog = false;
+				uni.navigateTo({
+				   url: '../myCenter/information'  // 我的收藏
+				})
+			},
 			goSearch() {
 				uni.navigateTo({
 					url: './searchresult'  // 我的搜索
@@ -146,16 +170,15 @@
 						}
 					});
 				},
+			//  进入判断是否授权
 			isUserInfo(b='scope.userInfo') {
 				let _this = this;
 				uni.getSetting({
 					success(res) {
-						// 未授权	
 						if(!res.authSetting[b]) {
-							// 打开授权按钮 用户点击授权
-							_this.showDialog(true);
-						}else {
 							_this.showDialog(false);
+						}else {
+							_this.showDialog(true);
 						}
 					}
 				})
@@ -174,6 +197,44 @@
 						}
 					})
 				},
+			
+			//wgs84togcj02  转火星坐标
+			 wgs84togcj02: function (lng, lat) {
+			      const PI = 3.1415926535897932384626
+			      const a = 6378245.0
+			      const ee = 0.00669342162296594323
+			      // WGS84转GCj02
+			      let dlat = this.transformlat(lng - 105.0, lat - 35.0)
+			      let dlng = this.transformlng(lng - 105.0, lat - 35.0)
+			      let radlat = lat / 180.0 * PI
+			      let magic = Math.sin(radlat)
+			      magic = 1 - ee * magic * magic
+			      let sqrtmagic = Math.sqrt(magic)
+			      dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI)
+			      dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI)
+			      let mglat = lat + dlat
+			      let mglng = lng + dlng
+			      // 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+			      return {lng: mglng, lat: mglat}
+			      // return gcj02tobd09(mglng, mglat)
+			    },
+			  transformlat: function (lng, lat) {
+			      const PI = 3.1415926535897932384626
+			      let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng))
+			      ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0
+			      ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0
+			      ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0
+			      return ret
+			    },
+			    transformlng: function (lng, lat) {
+			      const PI = 3.1415926535897932384626
+			      let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng))
+			      ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0
+			      ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0
+			      ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0
+			      return ret
+			    },
+
 		    getLocationInfo(){  //获取地理位置
 		    		let _this=this;
 		    		uni.getLocation({
@@ -183,22 +244,34 @@
 		    				let latitude,longitude;
 		    				latitude = res.latitude.toString();
 		    				longitude = res.longitude.toString();
+							let ws = _this.wgs84togcj02(latitude,longitude) // 转换成gcjo2
+						    let lng = ws.lng
+						    let lat = ws.lat
+							console.log(lng);console.log(lat)
 							_this.loaction = '测试定位';
-		    				uni.request({
-		    					header:{
-		    						"Content-Type": "application/text"
-		    					},
-		    					url:'',
-		    					success(re) {
-		    						console.log("中文位置")
-		    						console.log(re)	   
-		    						if(re.statusCode===200){
-		    							console.log("获取中文街道地理位置成功")
-		    						}else{
-		    							console.log("获取信息失败，请重试！")
-		    						}
-		    					 }
-		    				});
+							request({
+								url:'',
+								methods:'',
+								success: (res) => {
+									console.log(res);
+									cosnole.log("请求成功")
+								}
+							})
+		    				// uni.request({
+		    				// 	header:{
+		    				// 		"Content-Type": "application/text"
+		    				// 	},
+		    				// 	url:'',
+		    				// 	success(re) {
+		    				// 		console.log("中文位置")
+		    				// 		console.log(re)	   
+		    				// 		if(re.statusCode===200){
+		    				// 			console.log("获取中文街道地理位置成功")
+		    				// 		}else{
+		    				// 			console.log("获取信息失败，请重试！")
+		    				// 		}
+		    				// 	 }
+		    				// });
 		    			},
 						fail(res) {
 							if(res.errMsg == 'getLocation:fail:system permission denied') {
@@ -209,17 +282,19 @@
 						}
 		    		});
 		    	},
+			
+			// 确定登录
 			wxlogion() {
-				let  that = this;
-			    uni.getUserInfo({
-			     success(res) {
-				     that.login(res.userInfo);
-					 that.showDialog(false);
-			     },
-			     fail(res) {
-				 that.$msg("授权失败")
-			     }
-			    })
+			// 	let  that = this;
+			//     uni.getUserInfo({
+			// 	     success(res) {
+			// 			 that.login(res.userInfo);
+			// 			 that.showDialog(true);
+			// 	     },
+			// 	     fail(res) {
+			// 			that.$msg("授权失败")
+			// 	     }
+			//     })
 		 },
 		 
 		 // 点击扫码

pages/myOrder/order.vue

@@ -43,11 +43,7 @@
 			<view class="payOrder" @click="goPay">去付款</view>
 		</view>
 	 </view>
-	<van-dialog use-slot title="确定取消订单？"
-	 show-cancel-button="true"
-	 @cancel="cancelDialog" @confirm="confirmOrder"
-	 :show="orderCancel">
-	 </van-dialog>
+
 	<Dialog  :orderCancel="orderCancel" 
 	    @colseDialog="cancelDialog" 
 	    @confirmPay="confirmOrder"
@@ -72,11 +68,12 @@
 				this.orderCancel = true;
 			},
 			cancelDialog() {
+				
 				this.orderCancel = false;
 			},
 			confirmOrder() {
+				
 				this.orderCancel = false;
-				this.$msg("取消成功");
 			},
 			goPay() {
 				uni.navigateTo({
@@ -153,6 +150,7 @@
 		padding: 0 36upx;
 		color: #606266;
 		border-top: 16upx solid #F5F5F5;
+		padding-bottom: 32upx;
 		view {
 			padding: 32upx 0 0 0;
 		}

store/logion.js

@@ -5,14 +5,14 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		hasLogin: false,
+		hasLogin: false,  //是否授权
 		sessionId:'',
-		showModal: false, //登录授权弹窗
+		//showModal: false, //登录授权弹窗
 		userInfo: {},
 	},
 	mutations: {
 		login(state, provider) {
-			state.hasLogin = true;
+			//state.hasLogin = true;
 			state.userInfo = provider;
 			uni.setStorage({//缓存用户登陆信息
 			    key: 'userInfo',  
@@ -30,12 +30,12 @@ const store = new Vuex.Store({
 			
 		},
 		showDialog(state, status) {
-			state.showModal = status;
-			uni.setStorage({//缓存用户登陆弹窗状态
-			    key: 'showModal',  
+			state.hasLogin = status;
+			uni.setStorage({
+			    key: 'hasLogin',  
 			    data: status  
 			}) 
-			console.log(state.showModal);
+			console.log(state.hasLogin);
 		},
 		
 		

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

@@ -57,5 +57,8 @@
       "desc": "演示定位能力"
     }
   },
-  "usingComponents": {}
+  "usingComponents": {
+    "van-dialog": "/wxcomponents/dist/dialog/index",
+    "van-cell": "/wxcomponents/dist/cell/index"
+  }
 }

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

@@ -13,7 +13,7 @@ var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 9));
 var _logion = _interopRequireDefault(__webpack_require__(/*! ./store/logion.js */ 16));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
 
 // 定义全局提示title
-
+var baseURL = 'http://192.168.1.12:8082';
 var msg = function msg(title) {var duration = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1500;var mask = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;var icon = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'none';
   //统一提示方便全局修改
   if (Boolean(title) === false) {
@@ -28,8 +28,42 @@ var msg = function msg(title) {var duration = arguments.length > 1 && arguments[
 };
 
 
+var request = function request(options) {
+  options.url = baseUrl + options.url;
+  option.method = options.method;
+  var token = uni.getStorageSync('sessionId');
+  if (sessionId) {// 如果存在sessionId 配置请求头
+    options.header = {
+      'Authorization': sessionId,
+      'Content-Type': 'application/json' };
+
+  } else {
+
+
+  } // 不存在token 跳转至登录
 
+  // 这里对response进行处理，
+  options.complete = function (response) {
+    if (response.statusCode == 401) {
+
+    }
+  };
+  return uni.request(options);
+};
+
+// const request = (url, urlhead, sessIoid) => {
+// 	uni.request({
+// 		url: baseURL+url,
+// 		method: urlhead,
+// 		header = {
+// 		  'Authorization' : 'Bearer ' + sessIoid,
+// 		  'Content-Type' : 'application/json'
+// 		},
+
+// 	})
+// }
 _vue.default.prototype.$msg = msg;
+_vue.default.prototype.request = request;
 _vue.default.config.productionTip = false;
 _vue.default.prototype.$store = _logion.default;
 _App.default.mpType = 'app';
@@ -132,7 +166,7 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
       uni.checkSession({
         success: function success() {
           console.log("登录未过期");
-          that.setOpenid("22222");
+          that.setOpenid(sessionId);
         },
 
         fail: function fail() {
@@ -141,6 +175,8 @@ var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumera
           uni.login({
             provider: 'weixin',
             success: function success(res) {
+              console.log(res);
+              console.log(sessionId);
               // 获取code  
               that.setOpenid("22222");
               that.login();

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -119,6 +119,8 @@
 
 
 
+
+
 
 
 

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

@@ -108,7 +108,7 @@
 /******/ 		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/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/uinNumber":"component/uinNumber","component/Dialog":"component/Dialog","component/textarea":"component/textarea","component/uploadImage":"component/uploadImage","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/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/uinNumber":"component/uinNumber","component/Dialog":"component/Dialog","component/textarea":"component/textarea","component/uploadImage":"component/uploadImage","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 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

@@ -2650,14 +2650,14 @@ _vue.default.use(_vuex.default);
 
 var store = new _vuex.default.Store({
   state: {
-    hasLogin: false,
+    hasLogin: false, //是否授权
     sessionId: '',
-    showModal: false, //登录授权弹窗
+    //showModal: false, //登录授权弹窗
     userInfo: {} },
 
   mutations: {
     login: function login(state, provider) {
-      state.hasLogin = true;
+      //state.hasLogin = true;
       state.userInfo = provider;
       uni.setStorage({ //缓存用户登陆信息
         key: 'userInfo',
@@ -2675,12 +2675,12 @@ var store = new _vuex.default.Store({
 
     },
     showDialog: function showDialog(state, status) {
-      state.showModal = status;
-      uni.setStorage({ //缓存用户登陆弹窗状态
-        key: 'showModal',
+      state.hasLogin = status;
+      uni.setStorage({
+        key: 'hasLogin',
         data: status });
 
-      console.log(state.showModal);
+      console.log(state.hasLogin);
     },
 
 

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

@@ -140,10 +140,10 @@ var _default =
   },
   watch: {
     'orderCancel': function orderCancel(val) {
-      console.log("监听中");
       if (val) {
         this.showdialog = true;
-        console.log(this.showdialog);
+      } else {
+        this.showdialog = false;
       }
     } },
 
@@ -154,8 +154,6 @@ var _default =
     cancelDialog: function cancelDialog() {
       this.show = false;
       this.$emit('colseDialog');
-      console.log("取消");
-      console.log(this.orderCancel);
     },
     confirmOrder: function confirmOrder() {
       this.show = false;

unpackage/dist/dev/mp-weixin/component/Dialog.wxml

@@ -1 +1 @@
-<block wx:if="{{showdialog}}"><view><van-dialog vue-id="2ef268be-1" title="确定取消订单？" show-cancel-button="true" show="{{showdialog}}" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></van-dialog></view></block>
+<block wx:if="{{showdialog}}"><view><van-dialog vue-id="2ef268be-1" title="确定取消订单？" show-cancel-button="true" show="{{showdialog}}" data-event-opts="{{[['^cancel',[['cancelDialog']]],['^confirm',[['confirmOrder']]]]}}" data-com-type="wx" bind:cancel="__e" bind:confirm="__e" bind:__l="__l"></van-dialog></view></block>

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

@@ -0,0 +1,195 @@
+(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["component/loginDialog"],{
+
+/***/ 304:
+/*!****************************************************!*\
+  !*** D:/uinapp/myuinapp/component/loginDialog.vue ***!
+  \****************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=template&id=67987460& */ 305);
+/* harmony import */ var _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loginDialog.vue?vue&type=script&lang=js& */ 307);
+/* harmony 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);
+
+var renderjs
+
+
+
+
+/* normalize component */
+
+var component = Object(_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__["default"])(
+  _loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
+  _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__["render"],
+  _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  false,
+  null,
+  null,
+  null,
+  false,
+  _loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__["components"],
+  renderjs
+)
+
+component.options.__file = "D:/uinapp/myuinapp/component/loginDialog.vue"
+/* harmony default export */ __webpack_exports__["default"] = (component.exports);
+
+/***/ }),
+
+/***/ 305:
+/*!***********************************************************************************!*\
+  !*** D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=template&id=67987460& ***!
+  \***********************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_16_0_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_template_id_67987460___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--16-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=template&id=67987460& */ 306);
+/* harmony 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"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", 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__["recyclableRender"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", 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__["components"]; });
+
+
+
+/***/ }),
+
+/***/ 306:
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
+var components
+var render = function() {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+}
+var recyclableRender = false
+var staticRenderFns = []
+render._withStripped = true
+
+
+
+/***/ }),
+
+/***/ 307:
+/*!*****************************************************************************!*\
+  !*** D:/uinapp/myuinapp/component/loginDialog.vue?vue&type=script&lang=js& ***!
+  \*****************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--12-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./loginDialog.vue?vue&type=script&lang=js& */ 308);
+/* harmony import */ var _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_12_1_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_C_Users_Administrator_Desktop_HBuilderX_2_6_8_20200330_full_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_loginDialog_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 308:
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./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& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _vuex = __webpack_require__(/*! vuex */ 12);function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}var _default =
+
+
+{
+  props: {
+    showdialog: {
+      default: false,
+      type: Boolean } },
+
+
+  data: function data() {
+    return {
+      show: false };
+
+  },
+  watch: {
+    'showdialog': function showdialog(val) {
+      if (val) {
+        this.show = true;
+      } else {
+        this.show = false;
+      }
+    } },
+
+  methods: _objectSpread({},
+  (0, _vuex.mapMutations)(['login', 'showDialog']), {
+    cancelDialog: function cancelDialog() {
+      this.$msg('登录失败');
+      this.login();
+      this.$emit('cancelDiaolog');
+      this.showDialog(false);
+    },
+    confirmOrder: function confirmOrder() {
+      this.wxlogion();
+    },
+    wxlogion: function wxlogion() {
+      var that = this;
+      uni.getUserInfo({
+        success: function success(res) {
+          that.login(res.userInfo);
+          that.showDialog(true);
+          that.$emit('confirmDiaolog');
+          that.$msg("登录成功");
+        },
+        fail: function fail(res) {
+          console.log(res);
+          that.$msg("登录失败");
+        } });
+
+    } }) };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
+
+/***/ })
+
+}]);
+//# sourceMappingURL=../../.sourcemap/mp-weixin/component/loginDialog.js.map
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'component/loginDialog-create-component',
+    {
+        'component/loginDialog-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('1')['createComponent'](__webpack_require__(304))
+        })
+    },
+    [['component/loginDialog-create-component']]
+]);

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

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

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

@@ -0,0 +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>

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -3,6 +3,7 @@
   "usingComponents": {
     "van-search": "/wxcomponents/dist/search/index",
     "uni-nav-bar": "/component/uni-nav-bar/uni-nav-bar",
-    "uni-icon": "/component/uni-icon/uni-icon"
+    "uni-icon": "/component/uni-icon/uni-icon",
+    "logion-dialog": "/component/loginDialog"
   }
 }

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

@@ -2,7 +2,6 @@
   "navigationBarTitleText": "搜索",
   "usingComponents": {
     "van-search": "/wxcomponents/dist/search/index",
-    "van-cell": "/wxcomponents/dist/cell/index",
     "uni-icon": "/component/uni-icon/uni-icon"
   }
 }

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

@@ -297,6 +297,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 
 
 

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

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "确认订单",
   "usingComponents": {
-    "van-cell": "/wxcomponents/dist/cell/index",
     "van-cell-group": "/wxcomponents/dist/cell-group/index",
     "van-radio": "/wxcomponents/dist/radio/index",
     "van-radio-group": "/wxcomponents/dist/radio-group/index",

unpackage/dist/dev/mp-weixin/pages/myCenter/business.json

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "商务合作",
   "usingComponents": {
-    "van-cell": "/wxcomponents/dist/cell/index",
     "van-cell-group": "/wxcomponents/dist/cell-group/index"
   }
 }

unpackage/dist/dev/mp-weixin/pages/myCenter/definite.json

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "圈币明细",
   "usingComponents": {
-    "van-cell": "/wxcomponents/dist/cell/index",
     "van-cell-group": "/wxcomponents/dist/cell-group/index"
   }
 }

unpackage/dist/dev/mp-weixin/pages/myCenter/index.json

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "我的",
   "usingComponents": {
-    "van-cell": "/wxcomponents/dist/cell/index",
     "uni-icon": "/component/uni-icon/uni-icon"
   }
 }

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

@@ -1,6 +1,4 @@
 {
   "navigationBarTitleText": "消息通知",
-  "usingComponents": {
-    "van-cell": "/wxcomponents/dist/cell/index"
-  }
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/myCenter/myCollect.json

@@ -3,7 +3,6 @@
   "usingComponents": {
     "van-tab": "/wxcomponents/dist/tab/index",
     "van-tabs": "/wxcomponents/dist/tabs/index",
-    "van-cell": "/wxcomponents/dist/cell/index",
     "van-card": "/wxcomponents/dist/card/index"
   }
 }

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

@@ -181,10 +181,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-
-
-
 
 
 
@@ -205,11 +201,12 @@ __webpack_require__.r(__webpack_exports__);
       this.orderCancel = true;
     },
     cancelDialog: function cancelDialog() {
+
       this.orderCancel = false;
     },
     confirmOrder: function confirmOrder() {
+
       this.orderCancel = false;
-      this.$msg("取消成功");
     },
     goPay: function goPay() {
       uni.navigateTo({

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

@@ -88,6 +88,7 @@ page {
   padding: 0 36rpx;
   color: #606266;
   border-top: 16rpx solid #F5F5F5;
+  padding-bottom: 32rpx;
 }
 .adressbottom view {
     padding: 32rpx 0 0 0;

unpackage/dist/dev/mp-weixin/pages/myOrder/paymoment.json

@@ -1,7 +1,6 @@
 {
   "navigationBarTitleText": "支付方式",
   "usingComponents": {
-    "van-cell": "/wxcomponents/dist/cell/index",
     "van-cell-group": "/wxcomponents/dist/cell-group/index",
     "van-radio": "/wxcomponents/dist/radio/index",
     "van-radio-group": "/wxcomponents/dist/radio-group/index"