修改实时天气

pages.json

@@ -155,9 +155,9 @@
 					}
 				},
 				{
-					"path": "notice/index",
+					"path": "weather/index",
 					"style": {
-						"navigationBarTitleText": "公告",
+						"navigationBarTitleText": "天气预报",
 						"enablePullDownRefresh": true
 					}
 				},

pagesHome/hotel/detail.vue

@@ -21,7 +21,8 @@
 				<view class="thr_1">
 					<view class="left">数量：</view>
 					<view class="right">
-						<text>{{info.num||'暂无'}}间</text>
+						<text v-if="info.num==0">售罄</text>
+						<text v-else>{{info.num||'暂无'}} 间</text>
 					</view>
 				</view>
 			</view>
@@ -30,7 +31,8 @@
 				<rich-text :nodes="formatRichText(info.brief)"></rich-text>
 			</view>
 			<view class="foot">
-				<view class="button" @click="toBuy"><text>预订</text></view>
+				<view class="button" v-if="info.num==0"><text>售罄</text></view>
+				<view class="button" v-else @click="toBuy"><text>预订</text></view>
 			</view>
 		</view>
 	</view>
@@ -97,9 +99,16 @@
 					// 删除找到的所有 img 元素中的 style 属性
 				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
 			},
-			// 预定
-			toBuy() {
-				console.log("预定");
+			// 预订
+			toBuy(item) {
+				const that = this;
+				if (that.user && that.user._id) {
+					console.log("预订");
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
 			},
 			// 查询其他信息
 			async searchOther() {

pagesHome/hotel/info.vue

@@ -61,9 +61,13 @@
 							<view class="list_1">
 								<view class="name textOne">{{ item.name ||'暂无'}}</view>
 								<view class="other other_1">￥{{ item.money ||'暂无'}}</view>
-								<view class="other other_2"><text>当天剩余房量：</text>{{ item.num||'暂无' }}间</view>
+								<view v-if="item.num==0" class="other other_2"><text>当天剩余房量：</text>售罄</view>
+								<view v-else class="other other_2"><text>当天剩余房量：</text>
+									{{ item.num||'暂无' }} 间
+								</view>
 								<view class="button">
-									<button @tap.stop="toBuy(item)" size="mini" type="primary">预订</button>
+									<button v-if="item.num==0" size="mini" type="primary">售罄</button>
+									<button v-else @tap.stop="toBuy(item)" size="mini" type="primary">预订</button>
 								</view>
 							</view>
 						</view>
@@ -180,9 +184,16 @@
 					url: `/pagesHome/hotel/detail?id=${e.id||e._id}`
 				})
 			},
-			// 预定
+			// 预订
 			toBuy(item) {
-				console.log(item);
+				const that = this;
+				if (that.user && that.user._id) {
+					console.log(item);
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
 			},
 			// 分页
 			toPage(e) {

pagesHome/notice/detail.vue

@@ -3,6 +3,7 @@
 		<view class="one">
 			<view class="one_1">{{info.name}}</view>
 			<view class="one_2">{{info.create_time}}</view>
+			<view class="one_2" @tap="toView(info.path)">公告链接：{{info.path}}</view>
 		</view>
 		<view class="two" v-if="info.file.length>0">
 			<swiperImg :imgsList='info.file'></swiperImg>
@@ -73,6 +74,12 @@
 					// 删除找到的所有 img 元素中的 style 属性
 				}).replace(/\<img/gi, '<img style="width:100%;"') // 对 img 元素增加 style 属性，并设置宽度为 100%
 			},
+			// 查看公告链接
+			toView(url) {
+				uni.navigateTo({
+					url: `/pagesHome/weather/index?url=${url}`
+				})
+			},
 		}
 	}
 </script>

pagesHome/weather/index.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: 'https://weathernew.pae.baidu.com/weathernew/pc?query=%E5%90%89%E6%9E%97%E9%95%BF%E6%98%A5%E5%A4%A9%E6%B0%94&srcid=4982'
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `url`, e && e.url);
+		},
+	}
+</script>

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

@@ -37,7 +37,7 @@
         "hotel/index",
         "hotel/info",
         "hotel/detail",
-        "notice/index",
+        "weather/index",
         "notice/detail"
       ]
     }

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

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniBadge: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 374))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 380))
     },
   }
 } catch (e) {

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

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     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 */ 442))
+      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 */ 448))
     },
     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 */ 449))
+      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 */ 455))
     },
   }
 } catch (e) {
@@ -277,6 +277,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -415,9 +419,16 @@ var _default = {
         url: "/pagesHome/hotel/detail?id=".concat(e.id || e._id)
       });
     },
-    // 预定
+    // 预订
     toBuy: function toBuy(item) {
-      console.log(item);
+      var that = this;
+      if (that.user && that.user._id) {
+        console.log(item);
+      } else {
+        uni.navigateTo({
+          url: "/pagesIndex/login/index"
+        });
+      }
     },
     // 分页
     toPage: function toPage(e) {

unpackage/dist/dev/mp-weixin/pagesHome/notice/index.wxss

@@ -1,60 +0,0 @@
-@charset "UTF-8";
-/* 水平间距 */
-/* 水平间距 */
-.main.data-v-46899e35 {
-  display: flex;
-  flex-direction: column;
-  width: 100vw;
-  height: 100vh;
-}
-.main .one.data-v-46899e35 {
-  position: relative;
-  flex-grow: 1;
-  background-color: var(--f9Color);
-  padding: 2vw 0 0 0;
-}
-.main .one .list.data-v-46899e35 {
-  background-color: var(--mainColor);
-  border: 1px solid var(--f5Color);
-  padding: 2vw;
-  margin: 2vw 2vw 0 2vw;
-  border-radius: 5px;
-}
-.main .one .list .list_1.data-v-46899e35 {
-  padding: 2vw;
-  font-weight: bold;
-  font-size: var(--font16Size);
-}
-.main .one .list .list_2.data-v-46899e35 {
-  padding: 2vw;
-  font-size: var(--font12Size);
-  text-align: right;
-}
-.main .one .list .list_2 .time.data-v-46899e35 {
-  padding: 0 0 2px 0;
-}
-.main .one .list .list_2 .time text.data-v-46899e35 {
-  color: var(--f85Color);
-}
-.scroll-view.data-v-46899e35 {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-.scroll-view .list-scroll-view.data-v-46899e35 {
-  display: flex;
-  flex-direction: column;
-}
-.is_bottom.data-v-46899e35 {
-  width: 100%;
-  text-align: center;
-}
-.is_bottom text.data-v-46899e35 {
-  padding: 2vw 0;
-  display: inline-block;
-  color: var(--f85Color);
-  font-size: var(--font14Size);
-}
-

unpackage/dist/dev/mp-weixin/pagesHome/notice/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "公告",
+  "navigationBarTitleText": "天气预报",
   "enablePullDownRefresh": true,
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pagesHome/weather/index.wxml

@@ -0,0 +1 @@
+<view><web-view src="{{url}}"></web-view></view>

unpackage/dist/dev/mp-weixin/pagesMy/account/index.js

@@ -146,7 +146,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 420));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 426));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/article/add.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 381))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 387))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 394))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 400))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 401))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 407))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 408))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 414))
     },
   }
 } catch (e) {
@@ -183,7 +183,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 420));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 426));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/opinion/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 381))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 387))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 394))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 400))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 401))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 407))
     },
   }
 } catch (e) {
@@ -176,7 +176,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 420));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 426));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {