地图导览

pages/map/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="main">
-		<map class="map" :latitude="latitude" :longitude="longitude" :scale="scale" :markers="markers"
-			@callouttap="toTap"></map>
+		<map class="map" :latitude="config.latitude" :longitude="config.longitude" :scale="config.scale"
+			:markers="markers" @callouttap="toTap"></map>
 	</view>
 </template>
 
@@ -9,43 +9,46 @@
 	export default {
 		data() {
 			return {
-				latitude: 43.3517, // 设置地图的纬度
-				longitude: 125.86854, // 设置地图的经度
-				scale: 13,
-				markers: [{
-					id: 0,
-					latitude: 43.34931,
-					longitude: 125.87221,
-					width: 20, //宽
-					height: 30, //高
-					callout: { //自定义标记点上方的气泡窗口 点击有效  
-						content: '吊水壶森林公园', //文本
-						color: '#ffffff', //文字颜色
-						fontSize: 14, //文本大小
-						borderRadius: 15, //边框圆角
-						borderWidth: '10',
-						bgColor: '#e51860', //背景颜色
-						display: 'ALWAYS', //常显
-					},
-				}, {
-					id: 1,
-					latitude: 43.34526,
-					longitude: 125.85224,
-					width: 20, //宽
-					height: 30, //高
-					callout: { //自定义标记点上方的气泡窗口 点击有效
-						content: '公厕', //文本
-						color: '#ffffff', //文字颜色
-						fontSize: 14, //文本大小
-						borderRadius: 15, //边框圆角
-						borderWidth: '10',
-						bgColor: '#e51860', //背景颜色
-						display: 'ALWAYS', //常显
-					},
-				}]
+				config: {},
+				markers: []
 			}
 		},
+		onLoad: async function() {
+			const that = this;
+			that.searchConfig();
+			that.search();
+		},
 		methods: {
+			async searchConfig() {
+				const that = this;
+				const res = await that.$api(`/config`, 'GET', {})
+				if (res.errcode == '0') {
+					that.$set(that, `config`, res.data)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				let info = {
+					is_use: '0',
+				}
+				let res;
+				res = await that.$api(`/map`, 'GET', {
+					...info,
+				});
+				if (res.errcode == '0') {
+					that.$set(that, `markers`, res.data);
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
 			// 点击标记点对应的气泡 播放多种语音类型的讲解
 			toTap(e) {
 				console.log(e);

pagesHome/hotel/index.vue

@@ -58,8 +58,12 @@
 				title: e && e.title || '分类'
 			});
 			that.searchConfig();
-			that.searchToken();
-			that.search();
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchToken();
+			await that.clearPage();
+			await that.search();
 		},
 		methods: {
 			searchToken() {
@@ -129,20 +133,26 @@
 			// 收藏
 			async onClick(item) {
 				const that = this;
-				let res;
-				if (item.is_collect == false) {
-					const form = {
-						user: that.user._id,
-						source: item._id,
-						source_type: "hotel",
-						type: '1',
-						create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+				if (that.user && that.user._id) {
+					let res;
+					if (item.is_collect == false) {
+						const form = {
+							user: that.user._id,
+							source: item._id,
+							source_type: "hotel",
+							type: '1',
+							create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+						}
+						res = await that.$api(`/like`, 'POST', form);
+					} else res = await that.$api(`/like/${item.collect}`, 'DELETE', {})
+					if (res.errcode == '0') {
+						that.clearPage();
+						that.search()
 					}
-					res = await that.$api(`/like`, 'POST', form);
-				} else res = await that.$api(`/like/${item.like}`, 'DELETE', {})
-				if (res.errcode == '0') {
-					that.clearPage();
-					that.search()
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
 				}
 			},
 			// 分页

pagesHome/hotel/info.vue

@@ -111,20 +111,18 @@
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
 			that.searchConfig();
-			that.search();
 		},
 		onShow: async function(e) {
 			const that = this;
-			that.searchToken();
+			await that.searchToken();
+			await that.search();
 		},
 		methods: {
 			searchToken() {
 				const that = this;
 				try {
 					const res = uni.getStorageSync('token');
-					if (res) {
-						that.$set(that, `user`, res);
-					}
+					if (res) that.$set(that, `user`, res);
 				} catch (e) {
 					uni.showToast({
 						title: err.errmsg,
@@ -149,7 +147,9 @@
 			async search() {
 				const that = this;
 				if (that.id) {
-					const res = await that.$api(`/hotel/${that.id}`, 'GET', {})
+					const data = {}
+					if (that.user._id) data.user = that.user._id
+					const res = await that.$api(`/hotel/hotel/${that.id}`, 'GET', data)
 					if (res.errcode == '0') {
 						that.$set(that, `info`, res.data)
 					} else {
@@ -209,18 +209,24 @@
 			// 收藏
 			async onClick(item) {
 				const that = this;
-				let res;
-				if (item.is_collect == false) {
-					const form = {
-						user: that.user._id,
-						source: item._id,
-						source_type: "hotel",
-						type: '1',
-						create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
-					}
-					res = await that.$api(`/like`, 'POST', form);
-				} else res = await that.$api(`/like/${item.like}`, 'DELETE', {})
-				if (res.errcode == '0') that.search()
+				if (that.user && that.user._id) {
+					let res;
+					if (item.is_collect == false) {
+						const form = {
+							user: that.user._id,
+							source: item._id,
+							source_type: "hotel",
+							type: '1',
+							create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+						}
+						res = await that.$api(`/like`, 'POST', form);
+					} else res = await that.$api(`/like/${item.collect}`, 'DELETE', {})
+					if (res.errcode == '0') that.search()
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
 			},
 			// 分页
 			toPage(e) {

pagesHome/ticket/info.vue

@@ -11,7 +11,7 @@
 				<view class="right_1 textOver">{{info.name||'暂无'}}</view>
 				<view class="right_2">已售 {{info.buy_num||0}}</view>
 				<view class="right_3">
-					<uni-fav :checked="info.is_collect" @tap.stop="onClick(item)" />
+					<uni-fav :checked="info.is_collect" @tap.stop="onClick(info)" />
 				</view>
 			</view>
 		</view>
@@ -76,12 +76,12 @@
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
 			that.searchConfig();
-			await that.searchOther();
-			await that.search();
 		},
 		onShow: async function(e) {
 			const that = this;
-			that.searchToken();
+			await that.searchToken();
+			await that.searchOther();
+			await that.search();
 		},
 		methods: {
 			searchToken() {
@@ -117,7 +117,7 @@
 				if (that.id) {
 					const info = {}
 					if (that.user._id) info.user = that.user._id
-					const res = await that.$api(`/ticket/ticket${that.id}`, 'GET', info)
+					const res = await that.$api(`/ticket/ticket/${that.id}`, 'GET', info)
 					if (res.errcode == '0') {
 						const type = that.typeList.find(i => i.value == res.data.type)
 						if (type) res.data.zhType = type.label
@@ -144,18 +144,24 @@
 			// 收藏
 			async onClick(item) {
 				const that = this;
-				let res;
-				if (item.is_collect == false) {
-					const form = {
-						user: that.user._id,
-						source: item._id,
-						source_type: "ticket",
-						type: '1',
-						create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
-					}
-					res = await that.$api(`/like`, 'POST', form);
-				} else res = await that.$api(`/like/${item.like}`, 'DELETE', {})
-				if (res.errcode == '0') that.search()
+				if (that.user && that.user._id) {
+					let res;
+					if (item.is_collect == false) {
+						const form = {
+							user: that.user._id,
+							source: item._id,
+							source_type: "ticket",
+							type: '1',
+							create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+						}
+						res = await that.$api(`/like`, 'POST', form);
+					} else res = await that.$api(`/like/${item.collect}`, 'DELETE', {})
+					if (res.errcode == '0') that.search()
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
 			},
 			// 预订
 			toBuy(item) {

pagesHome/type/index.vue

@@ -57,8 +57,12 @@
 				title: e && e.title || '分类'
 			});
 			that.searchConfig();
-			that.searchToken();
-			that.search();
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchToken();
+			await that.clearPage();
+			await that.search();
 		},
 		methods: {
 			searchToken() {
@@ -128,20 +132,26 @@
 			// 收藏
 			async onClick(item) {
 				const that = this;
-				let res;
-				if (item.is_collect == false) {
-					const form = {
-						user: that.user._id,
-						source: item._id,
-						source_type: "location",
-						type: '1',
-						create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+				if (that.user && that.user._id) {
+					let res;
+					if (item.is_collect == false) {
+						const form = {
+							user: that.user._id,
+							source: item._id,
+							source_type: "location",
+							type: '1',
+							create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+						}
+						res = await that.$api(`/like`, 'POST', form);
+					} else res = await that.$api(`/like/${item.collect}`, 'DELETE', {})
+					if (res.errcode == '0') {
+						that.clearPage();
+						that.search()
 					}
-					res = await that.$api(`/like`, 'POST', form);
-				} else res = await that.$api(`/like/${item.like}`, 'DELETE', {})
-				if (res.errcode == '0') {
-					that.clearPage();
-					that.search()
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
 				}
 			},
 			// 分页

pagesHome/type/info.vue

@@ -71,8 +71,11 @@
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
 			await that.searchOther();
-			that.searchToken();
-			that.search();
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchToken();
+			await that.search();
 		},
 		methods: {
 			searchToken() {
@@ -93,7 +96,9 @@
 			async search() {
 				const that = this;
 				if (that.id) {
-					const res = await that.$api(`/location/${that.id}`, 'GET', {})
+					const info = {}
+					if (that.user._id) info.user = that.user._id
+					const res = await that.$api(`/location/location/${that.id}`, 'GET', info)
 					if (res.errcode == '0') {
 						const type = that.typeList.find(i => i.value == res.data.type)
 						if (type) res.data.zhType = type.label
@@ -120,18 +125,24 @@
 			// 收藏
 			async onClick(item) {
 				const that = this;
-				let res;
-				if (item.is_collect == false) {
-					const form = {
-						user: that.user._id,
-						source: item._id,
-						source_type: "location",
-						type: '1',
-						create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
-					}
-					res = await that.$api(`/like`, 'POST', form);
-				} else res = await that.$api(`/like/${item.like}`, 'DELETE', {})
-				if (res.errcode == '0') that.search()
+				if (that.user && that.user._id) {
+					let res;
+					if (item.is_collect == false) {
+						const form = {
+							user: that.user._id,
+							source: item._id,
+							source_type: "location",
+							type: '1',
+							create_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+						}
+						res = await that.$api(`/like`, 'POST', form);
+					} else res = await that.$api(`/like/${item.collect}`, 'DELETE', {})
+					if (res.errcode == '0') that.search()
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
 			},
 			// 查询其他信息
 			async searchOther() {

pagesIndex/collect/index.vue

@@ -9,7 +9,9 @@
 							<view class="pubuBox">
 								<view class="pubuItem">
 									<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
-										<image :src="item.file&&item.file.length>0?item.file[0].url:''" mode="widthFix">
+										<image v-if="item.file.length>0" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="widthFix">
+										</image>
+										<image v-else :src="config.file&&config.file.length>0?config.file[0].url:''" mode="widthFix">
 										</image>
 										<view class="title"> <!-- 这是没有高度的父盒子（下半部分） -->
 											<view class="title_1">{{ item.title ||item.name||'暂无'}}</view>
@@ -173,11 +175,11 @@
 					})
 				}
 			},
-			// 取消点赞
+			// 取消收藏
 			async toLike(item) {
 				const that = this;
 				let res;
-				res = await that.$api(`/like/${item.like}`, 'DELETE', {})
+				res = await that.$api(`/like/${item.collect}`, 'DELETE', {})
 				if (res.errcode == '0') {
 					that.clearPage();
 					that.search()

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

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -40662,10 +40662,62 @@ exports.default = _default;
 /* 497 */,
 /* 498 */,
 /* 499 */,
-/* 500 */,
-/* 501 */,
-/* 502 */,
-/* 503 */,
+/* 500 */
+/*!*******************************************************************************************!*\
+  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/index.js ***!
+  \*******************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 501));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 502));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 503));
+var _default = {
+  en: _en.default,
+  'zh-Hans': _zhHans.default,
+  'zh-Hant': _zhHant.default
+};
+exports.default = _default;
+
+/***/ }),
+/* 501 */
+/*!******************************************************************************************!*\
+  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/en.json ***!
+  \******************************************************************************************/
+/*! exports provided: uni-fav.collect, uni-fav.collected, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"uni-fav.collect\":\"collect\",\"uni-fav.collected\":\"collected\"}");
+
+/***/ }),
+/* 502 */
+/*!***********************************************************************************************!*\
+  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hans.json ***!
+  \***********************************************************************************************/
+/*! exports provided: uni-fav.collect, uni-fav.collected, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"uni-fav.collect\":\"收藏\",\"uni-fav.collected\":\"已收藏\"}");
+
+/***/ }),
+/* 503 */
+/*!***********************************************************************************************!*\
+  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json ***!
+  \***********************************************************************************************/
+/*! exports provided: uni-fav.collect, uni-fav.collected, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"uni-fav.collect\":\"收藏\",\"uni-fav.collected\":\"已收藏\"}");
+
+/***/ }),
 /* 504 */,
 /* 505 */,
 /* 506 */,
@@ -40687,38 +40739,7 @@ exports.default = _default;
 /* 522 */,
 /* 523 */,
 /* 524 */,
-/* 525 */,
-/* 526 */,
-/* 527 */,
-/* 528 */,
-/* 529 */,
-/* 530 */,
-/* 531 */,
-/* 532 */,
-/* 533 */,
-/* 534 */,
-/* 535 */,
-/* 536 */,
-/* 537 */,
-/* 538 */,
-/* 539 */,
-/* 540 */,
-/* 541 */,
-/* 542 */,
-/* 543 */,
-/* 544 */,
-/* 545 */,
-/* 546 */,
-/* 547 */,
-/* 548 */,
-/* 549 */,
-/* 550 */,
-/* 551 */,
-/* 552 */,
-/* 553 */,
-/* 554 */,
-/* 555 */,
-/* 556 */
+/* 525 */
 /*!***********************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-calendar/components/uni-calendar/util.js ***!
   \***********************************************************************************************/
@@ -40736,7 +40757,7 @@ exports.default = void 0;
 var _typeof2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/typeof */ 13));
 var _classCallCheck2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/classCallCheck */ 23));
 var _createClass2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/createClass */ 24));
-var _calendar = _interopRequireDefault(__webpack_require__(/*! ./calendar.js */ 557));
+var _calendar = _interopRequireDefault(__webpack_require__(/*! ./calendar.js */ 526));
 var Calendar = /*#__PURE__*/function () {
   function Calendar() {
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -41133,7 +41154,7 @@ var _default = Calendar;
 exports.default = _default;
 
 /***/ }),
-/* 557 */
+/* 526 */
 /*!***************************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-calendar/components/uni-calendar/calendar.js ***!
   \***************************************************************************************************/
@@ -41650,7 +41671,7 @@ var _default = calendar;
 exports.default = _default;
 
 /***/ }),
-/* 558 */
+/* 527 */
 /*!*****************************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-calendar/components/uni-calendar/i18n/index.js ***!
   \*****************************************************************************************************/
@@ -41665,9 +41686,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 559));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 560));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 561));
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 528));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 529));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 530));
 var _default = {
   en: _en.default,
   'zh-Hans': _zhHans.default,
@@ -41676,7 +41697,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 559 */
+/* 528 */
 /*!****************************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-calendar/components/uni-calendar/i18n/en.json ***!
   \****************************************************************************************************/
@@ -41686,7 +41707,7 @@ exports.default = _default;
 module.exports = JSON.parse("{\"uni-calender.ok\":\"ok\",\"uni-calender.cancel\":\"cancel\",\"uni-calender.today\":\"today\",\"uni-calender.MON\":\"MON\",\"uni-calender.TUE\":\"TUE\",\"uni-calender.WED\":\"WED\",\"uni-calender.THU\":\"THU\",\"uni-calender.FRI\":\"FRI\",\"uni-calender.SAT\":\"SAT\",\"uni-calender.SUN\":\"SUN\"}");
 
 /***/ }),
-/* 560 */
+/* 529 */
 /*!*********************************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hans.json ***!
   \*********************************************************************************************************/
@@ -41696,7 +41717,7 @@ module.exports = JSON.parse("{\"uni-calender.ok\":\"ok\",\"uni-calender.cancel\"
 module.exports = JSON.parse("{\"uni-calender.ok\":\"确定\",\"uni-calender.cancel\":\"取消\",\"uni-calender.today\":\"今日\",\"uni-calender.SUN\":\"日\",\"uni-calender.MON\":\"一\",\"uni-calender.TUE\":\"二\",\"uni-calender.WED\":\"三\",\"uni-calender.THU\":\"四\",\"uni-calender.FRI\":\"五\",\"uni-calender.SAT\":\"六\"}");
 
 /***/ }),
-/* 561 */
+/* 530 */
 /*!*********************************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-calendar/components/uni-calendar/i18n/zh-Hant.json ***!
   \*********************************************************************************************************/
@@ -41706,30 +41727,28 @@ module.exports = JSON.parse("{\"uni-calender.ok\":\"确定\",\"uni-calender.canc
 module.exports = JSON.parse("{\"uni-calender.ok\":\"確定\",\"uni-calender.cancel\":\"取消\",\"uni-calender.today\":\"今日\",\"uni-calender.SUN\":\"日\",\"uni-calender.MON\":\"一\",\"uni-calender.TUE\":\"二\",\"uni-calender.WED\":\"三\",\"uni-calender.THU\":\"四\",\"uni-calender.FRI\":\"五\",\"uni-calender.SAT\":\"六\"}");
 
 /***/ }),
-/* 562 */,
-/* 563 */,
-/* 564 */,
-/* 565 */,
-/* 566 */,
-/* 567 */,
-/* 568 */,
-/* 569 */,
-/* 570 */,
-/* 571 */,
-/* 572 */,
-/* 573 */,
-/* 574 */,
-/* 575 */,
-/* 576 */,
-/* 577 */,
-/* 578 */,
-/* 579 */,
-/* 580 */,
-/* 581 */,
-/* 582 */,
-/* 583 */,
-/* 584 */,
-/* 585 */
+/* 531 */,
+/* 532 */,
+/* 533 */,
+/* 534 */,
+/* 535 */,
+/* 536 */,
+/* 537 */,
+/* 538 */,
+/* 539 */,
+/* 540 */,
+/* 541 */,
+/* 542 */,
+/* 543 */,
+/* 544 */,
+/* 545 */,
+/* 546 */,
+/* 547 */,
+/* 548 */,
+/* 549 */,
+/* 550 */,
+/* 551 */,
+/* 552 */
 /*!**************************************************************************************************************!*\
   !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
   \**************************************************************************************************************/
@@ -41862,68 +41881,6 @@ function createAnimation(option, _this) {
 }
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
-/***/ }),
-/* 586 */,
-/* 587 */,
-/* 588 */,
-/* 589 */,
-/* 590 */,
-/* 591 */,
-/* 592 */
-/*!*******************************************************************************************!*\
-  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/index.js ***!
-  \*******************************************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 593));
-var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 594));
-var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 595));
-var _default = {
-  en: _en.default,
-  'zh-Hans': _zhHans.default,
-  'zh-Hant': _zhHant.default
-};
-exports.default = _default;
-
-/***/ }),
-/* 593 */
-/*!******************************************************************************************!*\
-  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/en.json ***!
-  \******************************************************************************************/
-/*! exports provided: uni-fav.collect, uni-fav.collected, default */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"uni-fav.collect\":\"collect\",\"uni-fav.collected\":\"collected\"}");
-
-/***/ }),
-/* 594 */
-/*!***********************************************************************************************!*\
-  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hans.json ***!
-  \***********************************************************************************************/
-/*! exports provided: uni-fav.collect, uni-fav.collected, default */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"uni-fav.collect\":\"收藏\",\"uni-fav.collected\":\"已收藏\"}");
-
-/***/ }),
-/* 595 */
-/*!***********************************************************************************************!*\
-  !*** D:/project/神鹿峰旅游/travel_applet/uni_modules/uni-fav/components/uni-fav/i18n/zh-Hant.json ***!
-  \***********************************************************************************************/
-/*! exports provided: uni-fav.collect, uni-fav.collected, default */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"uni-fav.collect\":\"收藏\",\"uni-fav.collected\":\"已收藏\"}");
-
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

unpackage/dist/dev/mp-weixin/pages/map/index.wxml

@@ -1 +1 @@
-<view class="main data-v-4219aa94"><map class="map data-v-4219aa94" latitude="{{latitude}}" longitude="{{longitude}}" scale="{{scale}}" markers="{{markers}}" data-event-opts="{{[['callouttap',[['toTap',['$event']]]]]}}" bindcallouttap="__e"></map></view>
+<view class="main data-v-4219aa94"><map class="map data-v-4219aa94" latitude="{{config.latitude}}" longitude="{{config.longitude}}" scale="{{config.scale}}" markers="{{markers}}" data-event-opts="{{[['callouttap',[['toTap',['$event']]]]]}}" bindcallouttap="__e"></map></view>

unpackage/dist/dev/mp-weixin/pagesHome/hotel/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 587))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 495))
     },
   }
 } catch (e) {
@@ -218,9 +218,7 @@ var _default = {
                 title: e && e.title || '分类'
               });
               that.searchConfig();
-              that.searchToken();
-              that.search();
-            case 6:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -232,6 +230,34 @@ var _default = {
     }
     return onLoad;
   }(),
+  onShow: function () {
+    var _onShow = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(e) {
+      var that;
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              that = this;
+              _context2.next = 3;
+              return that.searchToken();
+            case 3:
+              _context2.next = 5;
+              return that.clearPage();
+            case 5:
+              _context2.next = 7;
+              return that.search();
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+    function onShow(_x2) {
+      return _onShow.apply(this, arguments);
+    }
+    return onShow;
+  }(),
   methods: {
     searchToken: function searchToken() {
       var that = this;
@@ -262,11 +288,11 @@ var _default = {
     // 查询
     search: function search() {
       var _this = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var that, info, res, list;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 that = _this;
                 info = {
@@ -276,10 +302,10 @@ var _default = {
                   status: '1'
                 };
                 if (that.user._id) info.user = that.user._id;
-                _context2.next = 5;
+                _context3.next = 5;
                 return that.$api("/hotel/hotel", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));
               case 5:
-                res = _context2.sent;
+                res = _context3.sent;
                 if (res.errcode == '0') {
                   list = [].concat((0, _toConsumableArray2.default)(that.list), (0, _toConsumableArray2.default)(res.data));
                   that.$set(that, "list", list);
@@ -291,10 +317,10 @@ var _default = {
                 }
               case 7:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }))();
     },
     // 输入框
@@ -313,15 +339,19 @@ var _default = {
     // 收藏
     onClick: function onClick(item) {
       var _this2 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var that, res, form;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 that = _this2;
+                if (!(that.user && that.user._id)) {
+                  _context4.next = 15;
+                  break;
+                }
                 if (!(item.is_collect == false)) {
-                  _context3.next = 8;
+                  _context4.next = 9;
                   break;
                 }
                 form = {
@@ -331,28 +361,34 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context3.next = 5;
+                _context4.next = 6;
                 return that.$api("/like", 'POST', form);
-              case 5:
-                res = _context3.sent;
-                _context3.next = 11;
+              case 6:
+                res = _context4.sent;
+                _context4.next = 12;
                 break;
-              case 8:
-                _context3.next = 10;
-                return that.$api("/like/".concat(item.like), 'DELETE', {});
-              case 10:
-                res = _context3.sent;
+              case 9:
+                _context4.next = 11;
+                return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
+                res = _context4.sent;
+              case 12:
                 if (res.errcode == '0') {
                   that.clearPage();
                   that.search();
                 }
-              case 12:
+                _context4.next = 16;
+                break;
+              case 15:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 16:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }))();
     },
     // 分页

unpackage/dist/dev/mp-weixin/pagesHome/hotel/info.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 587))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 495))
     },
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 495))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 506))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 502))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 513))
     },
   }
 } catch (e) {
@@ -231,8 +231,7 @@ var _default = {
               that = this;
               that.$set(that, "id", e && e.id || '');
               that.searchConfig();
-              that.search();
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -252,8 +251,12 @@ var _default = {
           switch (_context2.prev = _context2.next) {
             case 0:
               that = this;
-              that.searchToken();
-            case 2:
+              _context2.next = 3;
+              return that.searchToken();
+            case 3:
+              _context2.next = 5;
+              return that.search();
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -270,9 +273,7 @@ var _default = {
       var that = this;
       try {
         var res = uni.getStorageSync('token');
-        if (res) {
-          that.$set(that, "user", res);
-        }
+        if (res) that.$set(that, "user", res);
       } catch (e) {
         uni.showToast({
           title: err.errmsg,
@@ -297,19 +298,21 @@ var _default = {
     search: function search() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var that, res, info, room, list;
+        var that, data, res, info, room, list;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
                 that = _this;
                 if (!that.id) {
-                  _context3.next = 11;
+                  _context3.next = 13;
                   break;
                 }
-                _context3.next = 4;
-                return that.$api("/hotel/".concat(that.id), 'GET', {});
-              case 4:
+                data = {};
+                if (that.user._id) data.user = that.user._id;
+                _context3.next = 6;
+                return that.$api("/hotel/hotel/".concat(that.id), 'GET', data);
+              case 6:
                 res = _context3.sent;
                 if (res.errcode == '0') {
                   that.$set(that, "info", res.data);
@@ -324,9 +327,9 @@ var _default = {
                   is_use: '0',
                   hotel: res.data._id
                 };
-                _context3.next = 9;
+                _context3.next = 11;
                 return that.$api("/room", 'GET', _objectSpread({}, info));
-              case 9:
+              case 11:
                 room = _context3.sent;
                 if (room.errcode == '0') {
                   list = [].concat((0, _toConsumableArray2.default)(that.list), (0, _toConsumableArray2.default)(room.data));
@@ -337,7 +340,7 @@ var _default = {
                     title: room.errmsg
                   });
                 }
-              case 11:
+              case 13:
               case "end":
                 return _context3.stop();
             }
@@ -383,8 +386,12 @@ var _default = {
             switch (_context4.prev = _context4.next) {
               case 0:
                 that = _this2;
+                if (!(that.user && that.user._id)) {
+                  _context4.next = 15;
+                  break;
+                }
                 if (!(item.is_collect == false)) {
-                  _context4.next = 8;
+                  _context4.next = 9;
                   break;
                 }
                 form = {
@@ -394,20 +401,26 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context4.next = 5;
+                _context4.next = 6;
                 return that.$api("/like", 'POST', form);
-              case 5:
+              case 6:
                 res = _context4.sent;
-                _context4.next = 11;
+                _context4.next = 12;
                 break;
-              case 8:
-                _context4.next = 10;
-                return that.$api("/like/".concat(item.like), 'DELETE', {});
-              case 10:
-                res = _context4.sent;
+              case 9:
+                _context4.next = 11;
+                return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
-                if (res.errcode == '0') that.search();
+                res = _context4.sent;
               case 12:
+                if (res.errcode == '0') that.search();
+                _context4.next = 16;
+                break;
+              case 15:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 16:
               case "end":
                 return _context4.stop();
             }

unpackage/dist/dev/mp-weixin/pagesHome/ticket/index.js

@@ -104,10 +104,10 @@ try {
       return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 480))
     },
     uniCalendar: function () {
-      return Promise.all(/*! import() | uni_modules/uni-calendar/components/uni-calendar/uni-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-calendar/components/uni-calendar/uni-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue */ 551))
+      return Promise.all(/*! import() | uni_modules/uni-calendar/components/uni-calendar/uni-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-calendar/components/uni-calendar/uni-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue */ 520))
     },
     uniPopup: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 573))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 533))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesHome/ticket/info.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 587))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 495))
     },
   }
 } catch (e) {
@@ -279,12 +279,7 @@ var _default = {
               that = this;
               that.$set(that, "id", e && e.id || '');
               that.searchConfig();
-              _context.next = 5;
-              return that.searchOther();
-            case 5:
-              _context.next = 7;
-              return that.search();
-            case 7:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -304,8 +299,15 @@ var _default = {
           switch (_context2.prev = _context2.next) {
             case 0:
               that = this;
-              that.searchToken();
-            case 2:
+              _context2.next = 3;
+              return that.searchToken();
+            case 3:
+              _context2.next = 5;
+              return that.searchOther();
+            case 5:
+              _context2.next = 7;
+              return that.search();
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -362,7 +364,7 @@ var _default = {
                 info = {};
                 if (that.user._id) info.user = that.user._id;
                 _context3.next = 6;
-                return that.$api("/ticket/ticket".concat(that.id), 'GET', info);
+                return that.$api("/ticket/ticket/".concat(that.id), 'GET', info);
               case 6:
                 res = _context3.sent;
                 if (res.errcode == '0') {
@@ -405,8 +407,12 @@ var _default = {
             switch (_context4.prev = _context4.next) {
               case 0:
                 that = _this2;
+                if (!(that.user && that.user._id)) {
+                  _context4.next = 15;
+                  break;
+                }
                 if (!(item.is_collect == false)) {
-                  _context4.next = 8;
+                  _context4.next = 9;
                   break;
                 }
                 form = {
@@ -416,20 +422,26 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context4.next = 5;
+                _context4.next = 6;
                 return that.$api("/like", 'POST', form);
-              case 5:
+              case 6:
                 res = _context4.sent;
-                _context4.next = 11;
+                _context4.next = 12;
                 break;
-              case 8:
-                _context4.next = 10;
-                return that.$api("/like/".concat(item.like), 'DELETE', {});
-              case 10:
-                res = _context4.sent;
+              case 9:
+                _context4.next = 11;
+                return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
-                if (res.errcode == '0') that.search();
+                res = _context4.sent;
               case 12:
+                if (res.errcode == '0') that.search();
+                _context4.next = 16;
+                break;
+              case 15:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 16:
               case "end":
                 return _context4.stop();
             }

unpackage/dist/dev/mp-weixin/pagesHome/type/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 587))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 495))
     },
   }
 } catch (e) {
@@ -218,9 +218,7 @@ var _default = {
                 title: e && e.title || '分类'
               });
               that.searchConfig();
-              that.searchToken();
-              that.search();
-            case 6:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -232,6 +230,34 @@ var _default = {
     }
     return onLoad;
   }(),
+  onShow: function () {
+    var _onShow = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(e) {
+      var that;
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              that = this;
+              _context2.next = 3;
+              return that.searchToken();
+            case 3:
+              _context2.next = 5;
+              return that.clearPage();
+            case 5:
+              _context2.next = 7;
+              return that.search();
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+    function onShow(_x2) {
+      return _onShow.apply(this, arguments);
+    }
+    return onShow;
+  }(),
   methods: {
     searchToken: function searchToken() {
       var that = this;
@@ -262,11 +288,11 @@ var _default = {
     // 查询
     search: function search() {
       var _this = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var that, info, res, list;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 that = _this;
                 info = {
@@ -276,10 +302,10 @@ var _default = {
                   type: that.type
                 };
                 if (that.user._id) info.user = that.user._id;
-                _context2.next = 5;
+                _context3.next = 5;
                 return that.$api("/location/location", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));
               case 5:
-                res = _context2.sent;
+                res = _context3.sent;
                 if (res.errcode == '0') {
                   list = [].concat((0, _toConsumableArray2.default)(that.list), (0, _toConsumableArray2.default)(res.data));
                   that.$set(that, "list", list);
@@ -291,10 +317,10 @@ var _default = {
                 }
               case 7:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }))();
     },
     // 输入框
@@ -313,15 +339,19 @@ var _default = {
     // 收藏
     onClick: function onClick(item) {
       var _this2 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var that, res, form;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 that = _this2;
+                if (!(that.user && that.user._id)) {
+                  _context4.next = 15;
+                  break;
+                }
                 if (!(item.is_collect == false)) {
-                  _context3.next = 8;
+                  _context4.next = 9;
                   break;
                 }
                 form = {
@@ -331,28 +361,34 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context3.next = 5;
+                _context4.next = 6;
                 return that.$api("/like", 'POST', form);
-              case 5:
-                res = _context3.sent;
-                _context3.next = 11;
+              case 6:
+                res = _context4.sent;
+                _context4.next = 12;
                 break;
-              case 8:
-                _context3.next = 10;
-                return that.$api("/like/".concat(item.like), 'DELETE', {});
-              case 10:
-                res = _context3.sent;
+              case 9:
+                _context4.next = 11;
+                return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
+                res = _context4.sent;
+              case 12:
                 if (res.errcode == '0') {
                   that.clearPage();
                   that.search();
                 }
-              case 12:
+                _context4.next = 16;
+                break;
+              case 15:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 16:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }))();
     },
     // 分页

unpackage/dist/dev/mp-weixin/pagesHome/type/info.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 587))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 495))
     },
   }
 } catch (e) {
@@ -260,9 +260,6 @@ var _default = {
               _context.next = 4;
               return that.searchOther();
             case 4:
-              that.searchToken();
-              that.search();
-            case 6:
             case "end":
               return _context.stop();
           }
@@ -274,6 +271,31 @@ var _default = {
     }
     return onLoad;
   }(),
+  onShow: function () {
+    var _onShow = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(e) {
+      var that;
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              that = this;
+              _context2.next = 3;
+              return that.searchToken();
+            case 3:
+              _context2.next = 5;
+              return that.search();
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+    function onShow(_x2) {
+      return _onShow.apply(this, arguments);
+    }
+    return onShow;
+  }(),
   methods: {
     searchToken: function searchToken() {
       var that = this;
@@ -292,21 +314,23 @@ var _default = {
     },
     search: function search() {
       var _this = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var that, res, type;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var that, info, res, type;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 that = _this;
                 if (!that.id) {
-                  _context2.next = 6;
+                  _context3.next = 8;
                   break;
                 }
-                _context2.next = 4;
-                return that.$api("/location/".concat(that.id), 'GET', {});
-              case 4:
-                res = _context2.sent;
+                info = {};
+                if (that.user._id) info.user = that.user._id;
+                _context3.next = 6;
+                return that.$api("/location/location/".concat(that.id), 'GET', info);
+              case 6:
+                res = _context3.sent;
                 if (res.errcode == '0') {
                   type = that.typeList.find(function (i) {
                     return i.value == res.data.type;
@@ -318,12 +342,12 @@ var _default = {
                     title: res.errmsg
                   });
                 }
-              case 6:
+              case 8:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }))();
     },
     // 处理富文本
@@ -340,15 +364,19 @@ var _default = {
     // 收藏
     onClick: function onClick(item) {
       var _this2 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var that, res, form;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 that = _this2;
+                if (!(that.user && that.user._id)) {
+                  _context4.next = 15;
+                  break;
+                }
                 if (!(item.is_collect == false)) {
-                  _context3.next = 8;
+                  _context4.next = 9;
                   break;
                 }
                 form = {
@@ -358,51 +386,57 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context3.next = 5;
+                _context4.next = 6;
                 return that.$api("/like", 'POST', form);
-              case 5:
-                res = _context3.sent;
-                _context3.next = 11;
+              case 6:
+                res = _context4.sent;
+                _context4.next = 12;
                 break;
-              case 8:
-                _context3.next = 10;
-                return that.$api("/like/".concat(item.like), 'DELETE', {});
-              case 10:
-                res = _context3.sent;
+              case 9:
+                _context4.next = 11;
+                return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
-                if (res.errcode == '0') that.search();
+                res = _context4.sent;
               case 12:
+                if (res.errcode == '0') that.search();
+                _context4.next = 16;
+                break;
+              case 15:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 16:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       }))();
     },
     // 查询其他信息
     searchOther: function searchOther() {
       var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
         var that, res;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 that = _this3;
-                _context4.next = 3;
+                _context5.next = 3;
                 return that.$api("/dictData", 'GET', {
                   type: 'project_type',
                   is_use: '0'
                 });
               case 3:
-                res = _context4.sent;
+                res = _context5.sent;
                 if (res.errcode == '0') that.$set(that, "typeList", res.data);
               case 5:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4);
+        }, _callee5);
       }))();
     }
   }

unpackage/dist/dev/mp-weixin/pagesIndex/collect/index.js

@@ -104,10 +104,14 @@ var render = function () {
   var _c = _vm._self._c || _h
   var l0 = _vm.__map(_vm.list, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g0 = item.file && item.file.length > 0
+    var g0 = item.file.length
+    var g1 = g0 > 0 ? item.file && item.file.length > 0 : null
+    var g2 = !(g0 > 0) ? _vm.config.file && _vm.config.file.length > 0 : null
     return {
       $orig: $orig,
       g0: g0,
+      g1: g1,
+      g2: g2,
     }
   })
   _vm.$mp.data = Object.assign(
@@ -372,7 +376,7 @@ var _default = {
         });
       }
     },
-    // 取消点赞
+    // 取消收藏
     toLike: function toLike(item) {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
@@ -383,7 +387,7 @@ var _default = {
               case 0:
                 that = _this2;
                 _context5.next = 3;
-                return that.$api("/like/".concat(item.like), 'DELETE', {});
+                return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 3:
                 res = _context5.sent;
                 if (res.errcode == '0') {

unpackage/dist/dev/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "calendar-item": "/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item"
-  },
-  "component": true
+  }
 }