Browse Source

重新分包,减少主包大小

xiaoxin 2 years ago
parent
commit
f7bdd7aaff
43 changed files with 253 additions and 273 deletions
  1. 1 1
      components/commentChild3.vue
  2. 0 48
      package-lock.json
  3. 0 1
      package.json
  4. 198 171
      pages.json
  5. 2 2
      pages/affirmOrder/affirmOrder.vue
  6. 1 1
      pages/binding/binding.vue
  7. 2 2
      pages/community/community.vue
  8. 5 5
      pages/detail/detail.vue
  9. 6 6
      pages/home3/home3.vue
  10. 1 1
      pages/identity/identity.vue
  11. 7 7
      pages/my/my.vue
  12. 1 1
      pages/orderDetail/orderDetail.vue
  13. 1 1
      pages/orderManage/orderManage.vue
  14. 1 1
      pages/shopInfo/shopInfo.vue
  15. 0 0
      pagesSub/addOrEdit/addOrEdit.vue
  16. 0 0
      pagesSub/addPlace/addPlace.vue
  17. 1 1
      pages/appraise/appraise.vue
  18. 0 0
      pagesSub/appraiseDetail/appraiseDetail.vue
  19. 0 0
      pagesSub/collect/collect.vue
  20. 2 2
      pages/common/common.vue
  21. 2 2
      pages/complaint/complaint.vue
  22. 3 3
      pages/complaintProgress/complaintProgress.vue
  23. 1 1
      pages/complaintStatus/complaintStatus.vue
  24. 0 0
      pagesSub/coupon/coupon.vue
  25. 0 0
      pagesSub/couponCenter/couponCenter.vue
  26. 0 0
      pagesSub/detailInfo/detailInfo.vue
  27. 2 2
      pages/evaluate/evaluate.vue
  28. 2 2
      pages/evaluateStatus/evaluateStatus.vue
  29. 0 0
      pagesSub/home/home.vue
  30. 1 1
      pages/likeList/likeList.vue
  31. 1 1
      pages/myComplaint/myComplaint.vue
  32. 1 1
      pages/myCoupon/myCoupon.vue
  33. 2 2
      pages/myEvaluate/myEvaluate.vue
  34. 1 1
      pages/myHome/myHome.vue
  35. 0 0
      pagesSub/newsDetail/newsDetail.vue
  36. 1 1
      pages/newsList/newsList.vue
  37. 0 0
      pagesSub/rimDetail/rimDetail.vue
  38. 2 2
      pages/send/send.vue
  39. 0 0
      pagesSub/set/set.vue
  40. 2 2
      pages/tweetDetail/tweetDetail.vue
  41. 0 0
      pagesSub/web/web.vue
  42. 2 0
      util/cos-wx-sdk-v5.min.js
  43. 1 1
      util/cos.js

+ 1 - 1
components/commentChild3.vue

@@ -71,7 +71,7 @@ export default {
 		},
 		handleGoMyHome(userId) {
 			uni.navigateTo({
-				url: `/pages/myHome/myHome?userId=${userId}`
+				url: `/pagesSub/myHome/myHome?userId=${userId}`
 			})
 		}
 	}

+ 0 - 48
package-lock.json

@@ -5,68 +5,20 @@
   "packages": {
     "": {
       "dependencies": {
-        "cos-wx-sdk-v5": "^1.4.13",
         "dayjs": "^1.11.10"
       }
     },
-    "node_modules/@xmldom/xmldom": {
-      "version": "0.8.10",
-      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/cos-wx-sdk-v5": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmmirror.com/cos-wx-sdk-v5/-/cos-wx-sdk-v5-1.4.13.tgz",
-      "integrity": "sha512-cTrccf+9sfihCiRnj1BcHeYsQu7T6tXMrFVK2hnHPr/uJHv6Qui7hFHQyjngx0mJPsQEaq0jn7QmrwWL9nWwsA==",
-      "dependencies": {
-        "@xmldom/xmldom": "^0.8.6",
-        "mime": "^2.4.6"
-      }
-    },
     "node_modules/dayjs": {
       "version": "1.11.10",
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
       "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
-    },
-    "node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
     }
   },
   "dependencies": {
-    "@xmldom/xmldom": {
-      "version": "0.8.10",
-      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
-    },
-    "cos-wx-sdk-v5": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmmirror.com/cos-wx-sdk-v5/-/cos-wx-sdk-v5-1.4.13.tgz",
-      "integrity": "sha512-cTrccf+9sfihCiRnj1BcHeYsQu7T6tXMrFVK2hnHPr/uJHv6Qui7hFHQyjngx0mJPsQEaq0jn7QmrwWL9nWwsA==",
-      "requires": {
-        "@xmldom/xmldom": "^0.8.6",
-        "mime": "^2.4.6"
-      }
-    },
     "dayjs": {
       "version": "1.11.10",
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz",
       "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
-    },
-    "mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
     }
   }
 }

+ 0 - 1
package.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "cos-wx-sdk-v5": "^1.4.13",
     "dayjs": "^1.11.10"
   }
 }

+ 198 - 171
pages.json

@@ -1,6 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		{
+	"pages": [{
 			"path": "pages/home3/home3",
 			"style": {
 				"navigationBarTitleText": "",
@@ -9,13 +8,6 @@
 			}
 		},
 		{
-			"path": "pages/home/home",
-			"style": {
-				"navigationBarTitleText": "靖安人家乡村民宿",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
 			"path": "pages/my/my",
 			"style": {
 				"navigationBarTitleText": "我的",
@@ -23,24 +15,6 @@
 				"navigationStyle": "custom"
 			}
 		}, {
-			"path": "pages/set/set",
-			"style": {
-				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/common/common",
-			"style": {
-				"navigationBarTitleText": "常用旅客",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/addOrEdit/addOrEdit",
-			"style": {
-				"navigationBarTitleText": "添加旅客",
-				"enablePullDownRefresh": false
-			}
-		}, {
 			"path": "pages/orderManage/orderManage",
 			"style": {
 				"navigationBarTitleText": "订单",
@@ -53,13 +27,6 @@
 				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "pages/detailInfo/detailInfo",
-			"style": {
-				"navigationBarTitleText": "设施详情",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}, {
 			"path": "pages/pay/pay",
 			"style": {
 				"navigationBarTitleText": "支付订单",
@@ -129,100 +96,6 @@
 				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "pages/web/web",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/coupon/coupon",
-			"style": {
-				"navigationBarTitleText": "优惠券",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/appraise/appraise",
-			"style": {
-				"navigationBarTitleText": "全部评价",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/appraiseDetail/appraiseDetail",
-			"style": {
-				"navigationBarTitleText": "评价详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/myEvaluate/myEvaluate",
-			"style": {
-				"navigationBarTitleText": "我的评价",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/collect/collect",
-			"style": {
-				"navigationBarTitleText": "收藏/住过",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/myCoupon/myCoupon",
-			"style": {
-				"navigationBarTitleText": "我的卡券",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/couponCenter/couponCenter",
-			"style": {
-				"navigationBarTitleText": "领券中心",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/myComplaint/myComplaint",
-			"style": {
-				"navigationBarTitleText": "投诉进度",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/complaintProgress/complaintProgress",
-			"style": {
-				"navigationBarTitleText": "进度详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/evaluate/evaluate",
-			"style": {
-				"navigationBarTitleText": "评价",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/evaluateStatus/evaluateStatus",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/complaint/complaint",
-			"style": {
-				"navigationBarTitleText": "我要投诉",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/complaintStatus/complaintStatus",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/send/send",
-			"style": {
-				"navigationBarTitleText": "发推文",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}, {
 			"path": "pages/identity/identity",
 			"style": {
 				"navigationBarTitleText": "",
@@ -235,54 +108,11 @@
 				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "pages/addPlace/addPlace",
-			"style": {
-				"navigationBarTitleText": "添加地点",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/tweetDetail/tweetDetail",
-			"style": {
-				"navigationBarTitleText": "推文详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/myHome/myHome",
-			"style": {
-				"navigationBarTitleText": "个人主页",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}, {
-			"path": "pages/likeList/likeList",
-			"style": {
-				"navigationBarTitleText": "点赞过的用户",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/rimDetail/rimDetail",
-			"style": {
-				"navigationBarTitleText": "周边详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
 			"path": "pages/rimInfo/rimInfo",
 			"style": {
 				"navigationBarTitleText": "简介",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/newsDetail/newsDetail",
-			"style": {
-				"navigationBarTitleText": "资讯详情",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/newsList/newsList",
-			"style": {
-				"navigationBarTitleText": "招商资讯",
-				"enablePullDownRefresh": false
-			}
 		}
 	],
 	"subpackages": [ //分包
@@ -399,6 +229,203 @@
 					"navigationBarTitleText": "支付提示"
 				}
 			}]
+		},
+		{
+			"root": "pagesSub",
+			"pages": [{
+					"path": "web/web",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}, {
+					"path": "home/home",
+					"style": {
+						"navigationBarTitleText": "靖安人家乡村民宿",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "myCoupon/myCoupon",
+					"style": {
+						"navigationBarTitleText": "我的卡券",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "coupon/coupon",
+					"style": {
+						"navigationBarTitleText": "优惠券",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "couponCenter/couponCenter",
+					"style": {
+						"navigationBarTitleText": "领券中心",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "set/set",
+					"style": {
+						"navigationBarTitleText": "设置",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "myHome/myHome",
+					"style": {
+						"navigationBarTitleText": "个人主页",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "common/common",
+					"style": {
+						"navigationBarTitleText": "常用旅客",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "addOrEdit/addOrEdit",
+					"style": {
+						"navigationBarTitleText": "添加旅客",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "collect/collect",
+					"style": {
+						"navigationBarTitleText": "收藏/住过",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "myComplaint/myComplaint",
+					"style": {
+						"navigationBarTitleText": "投诉进度",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "complaintProgress/complaintProgress",
+					"style": {
+						"navigationBarTitleText": "进度详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "myEvaluate/myEvaluate",
+					"style": {
+						"navigationBarTitleText": "我的评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "detailInfo/detailInfo",
+					"style": {
+						"navigationBarTitleText": "设施详情",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "appraise/appraise",
+					"style": {
+						"navigationBarTitleText": "全部评价",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "appraiseDetail/appraiseDetail",
+					"style": {
+						"navigationBarTitleText": "评价详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "evaluate/evaluate",
+					"style": {
+						"navigationBarTitleText": "评价",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "evaluateStatus/evaluateStatus",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "complaint/complaint",
+					"style": {
+						"navigationBarTitleText": "我要投诉",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "complaintStatus/complaintStatus",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "send/send",
+					"style": {
+						"navigationBarTitleText": "发推文",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "addPlace/addPlace",
+					"style": {
+						"navigationBarTitleText": "添加地点",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "likeList/likeList",
+					"style": {
+						"navigationBarTitleText": "点赞过的用户",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "newsDetail/newsDetail",
+					"style": {
+						"navigationBarTitleText": "资讯详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "rimDetail/rimDetail",
+					"style": {
+						"navigationBarTitleText": "周边详情",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "newsList/newsList",
+					"style": {
+						"navigationBarTitleText": "招商资讯",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "tweetDetail/tweetDetail",
+					"style": {
+						"navigationBarTitleText": "推文详情",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		}
 	],
 	"tabBar": {

+ 2 - 2
pages/affirmOrder/affirmOrder.vue

@@ -268,7 +268,7 @@ export default {
 		},
 		handleSelectClient() {
 			uni.navigateTo({
-				url: '/pages/common/common?type=1'
+				url: '/pagesSub/common/common?type=1'
 			})
 		},
 		confirm(e) {
@@ -386,7 +386,7 @@ export default {
 		handleGoPage() {
 			let temTotalPrice = (this.roomCount * this.totalMoney).toFixed(2)
 			uni.navigateTo({
-				url: `/pages/coupon/coupon?id=${this.info.hotelId}&totalPrice=${temTotalPrice}&complaintId=${this.chooseObj.complaintId}`
+				url: `/pagesSub/coupon/coupon?id=${this.info.hotelId}&totalPrice=${temTotalPrice}&complaintId=${this.chooseObj.complaintId}`
 			})
 		}
 	}

+ 1 - 1
pages/binding/binding.vue

@@ -68,7 +68,7 @@ export default {
 				return
 			}
 			uni.navigateTo({
-				url: `/pages/web/web?url=https://www.jinganrenjiams.com/hotelReservation/getLoginCode/&formName=${this.formName}&formPassword=${this.formPassword}&type=${this.type}&status=${this.status}`
+				url: `/pagesSub/web/web?url=https://www.jinganrenjiams.com/hotelReservation/getLoginCode/&formName=${this.formName}&formPassword=${this.formPassword}&type=${this.type}&status=${this.status}`
 			})
 		}
 	}

+ 2 - 2
pages/community/community.vue

@@ -209,7 +209,7 @@ export default {
 		// 点击悬浮按钮回调
 		handleClickBtn() {
 			uni.navigateTo({
-				url: '/pages/send/send'
+				url: '/pagesSub/send/send'
 			})
 		},
 		// 搜索按钮点击回调
@@ -248,7 +248,7 @@ export default {
 		// 点击每一个推文回调
 		goPageDetail(item) {
 			uni.navigateTo({
-				url: `/pages/tweetDetail/tweetDetail?id=${item.id}&townId=${item.townId}`
+				url: `/pagesSub/tweetDetail/tweetDetail?id=${item.id}&townId=${item.townId}`
 			})
 		}
 	}

+ 5 - 5
pages/detail/detail.vue

@@ -561,7 +561,7 @@ export default {
 			} else {
 				let info = encodeURIComponent(JSON.stringify(item))
 				uni.navigateTo({
-					url: `/pages/rimDetail/rimDetail?info=${info}`
+					url: `/pagesSub/rimDetail/rimDetail?info=${info}`
 				})
 			}
 		},
@@ -751,7 +751,7 @@ export default {
 		// 点击设施详情回调
 		goPageDetailInfo() {
 			uni.navigateTo({
-				url: `/pages/detailInfo/detailInfo?hotelId=${this.hotelId}`
+				url: `/pagesSub/detailInfo/detailInfo?hotelId=${this.hotelId}`
 			})
 		},
 		// 点击 订 预定 按钮回调
@@ -855,13 +855,13 @@ export default {
 			let temURL = linkProUrl.slice(22)
 			let url = 'https://f10mfe54bri.720yun.com' + temURL
 			uni.navigateTo({
-				url: `/pages/web/web?url=${url}`
+				url: `/pagesSub/web/web?url=${url}`
 			})
 		},
 		// 点击每一个评价回调
 		handleGoDetail(item) {
 			uni.navigateTo({
-				url: `/pages/appraiseDetail/appraiseDetail?id=${item.id}`
+				url: `/pagesSub/appraiseDetail/appraiseDetail?id=${item.id}`
 			})
 		},
 		// 点击评价图片回调
@@ -877,7 +877,7 @@ export default {
 		},
 		handleGoPage() {
 			uni.navigateTo({
-				url: `/pages/appraise/appraise?hotelId=${this.hotelId}`
+				url: `/pagesSub/appraise/appraise?hotelId=${this.hotelId}`
 			})
 		},
 		handleClickSwiper(urls, current) {

+ 6 - 6
pages/home3/home3.vue

@@ -566,7 +566,7 @@ export default {
 			let openid = uni.getStorageSync('openid')
 			if (openid) {
 				uni.navigateTo({
-					url: `/pages/tweetDetail/tweetDetail?id=${info.id}&townId=${info.townId}`
+					url: `/pagesSub/tweetDetail/tweetDetail?id=${info.id}&townId=${info.townId}`
 				})
 			} else {
 				uni.showToast({
@@ -673,7 +673,7 @@ export default {
 		handleChooseTown2(name) {
 			// this.town = name
 			uni.navigateTo({
-				url: `/pages/home/home?town=${name}&keywords=${this.keywords}&level=${this.level}`
+				url: `/pagesSub/home/home?town=${name}&keywords=${this.keywords}&level=${this.level}`
 			})
 		},
 		handleChooseLv() {
@@ -692,7 +692,7 @@ export default {
 		},
 		handleSearch() {
 			uni.navigateTo({
-				url: `/pages/home/home?town=${this.town}&keywords=${this.keywords}&level=${this.level}`
+				url: `/pagesSub/home/home?town=${this.town}&keywords=${this.keywords}&level=${this.level}`
 			})
 		},
 
@@ -732,12 +732,12 @@ export default {
 		handleGoNews(item) {
 			let info = encodeURIComponent(JSON.stringify(item))
 			uni.navigateTo({
-				url: `/pages/newsDetail/newsDetail?info=${info}`
+				url: `/pagesSub/newsDetail/newsDetail?info=${info}`
 			})
 		},
 		handleGoNewsList() {
 			uni.navigateTo({
-				url: '/pages/newsList/newsList'
+				url: '/pagesSub/newsList/newsList'
 			})
 		},
 		htmlLoad(item) {
@@ -751,7 +751,7 @@ export default {
 		},
 		handleGoHome() {
 			uni.navigateTo({
-				url: '/pages/home/home'
+				url: '/pagesSub/home/home'
 			})
 		},
 		changeDot(e) {

+ 1 - 1
pages/identity/identity.vue

@@ -17,7 +17,7 @@ export default {
 	methods: {
 		handleCheck(type) {
 			uni.navigateTo({
-				url: `/pages/web/web?url=https://www.jinganrenjiams.com/hotelReservation/getLoginCode/&type=${type}&check=1`
+				url: `/pagesSub/web/web?url=https://www.jinganrenjiams.com/hotelReservation/getLoginCode/&type=${type}&check=1`
 			})
 		}
 	}

+ 7 - 7
pages/my/my.vue

@@ -29,23 +29,23 @@
 						<img class="box_img" src="../../static/my/order.png" />
 						<view class="box_text">订单管理</view>
 					</view>
-					<view class="item_box" @click="handleGoPage('/pages/myEvaluate/myEvaluate')">
+					<view class="item_box" @click="handleGoPage('/pagesSub/myEvaluate/myEvaluate')">
 						<img class="box_img" src="../../static/my/evaluate.png" />
 						<view class="box_text">我的评价</view>
 					</view>
-					<view class="item_box" @click="handleGoPage('/pages/myComplaint/myComplaint')">
+					<view class="item_box" @click="handleGoPage('/pagesSub/myComplaint/myComplaint')">
 						<img class="box_img" src="../../static/my/complaint.png" />
 						<view class="box_text">投诉进度</view>
 					</view>
-					<view class="item_box" @click="handleGoPage('/pages/collect/collect')">
+					<view class="item_box" @click="handleGoPage('/pagesSub/collect/collect')">
 						<img class="box_img" src="../../static/my/collect.png" />
 						<view class="box_text">收藏/住过</view>
 					</view>
-					<view class="item_box" @click="handleGoPage('/pages/myCoupon/myCoupon')">
+					<view class="item_box" @click="handleGoPage('/pagesSub/myCoupon/myCoupon')">
 						<img class="box_img" src="../../static/my/coupon.png" />
 						<view class="box_text">我的卡券</view>
 					</view>
-					<view class="item_box" @click="handleGoPage('/pages/common/common')">
+					<view class="item_box" @click="handleGoPage('/pagesSub/common/common')">
 						<img class="box_img" src="../../static/my/people.png" />
 						<view class="box_text">常用旅客</view>
 					</view>
@@ -95,7 +95,7 @@
 						<img class="box_img" src="../../static/my/center.png" />
 						<view class="box_text">个人主页</view>
 					</view>
-					<view class="item_box" @click="handleGoPage('/pages/set/set')">
+					<view class="item_box" @click="handleGoPage('/pagesSub/set/set')">
 						<img class="box_img" src="../../static/my/set.png" />
 						<view class="box_text">设置</view>
 					</view>
@@ -192,7 +192,7 @@ export default {
 		handleGoPageHome() {
 			let userId = uni.getStorageSync('userInfo').id
 			uni.navigateTo({
-				url: `/pages/myHome/myHome?userId=${userId}`
+				url: `/pagesSub/myHome/myHome?userId=${userId}`
 			})
 		},
 		handleShowTest() {

+ 1 - 1
pages/orderDetail/orderDetail.vue

@@ -403,7 +403,7 @@ export default {
 		},
 		handleGoPage() {
 			uni.navigateTo({
-				url: `/pages/complaint/complaint?bookingId=${this.info.id}&hotelId=${this.info.hotelId}&houseId=${this.info.houseId}`
+				url: `/pagesSub/complaint/complaint?bookingId=${this.info.id}&hotelId=${this.info.hotelId}&houseId=${this.info.houseId}`
 			})
 		}
 	}

+ 1 - 1
pages/orderManage/orderManage.vue

@@ -429,7 +429,7 @@ export default {
 		handleEvaluate(item) {
 			this.handleDeleteList()
 			uni.navigateTo({
-				url: `/pages/evaluate/evaluate?bookingId=${item.id}&hotelId=${item.hotelId}&houseId=${item.houseId}`
+				url: `/pagesSub/evaluate/evaluate?bookingId=${item.id}&hotelId=${item.hotelId}&houseId=${item.houseId}`
 			})
 		},
 		// 计算两个点之间的距离

+ 1 - 1
pages/shopInfo/shopInfo.vue

@@ -61,7 +61,7 @@ export default {
 		handleGoMsg() {
 			let url = 'https://www.jinganrenjiams.com/hotelReservation/pc4/'
 			uni.navigateTo({
-				url: `/pages/web/web?url=${url}`
+				url: `/pagesSub/web/web?url=${url}`
 			})
 		}
 	}

pages/addOrEdit/addOrEdit.vue → pagesSub/addOrEdit/addOrEdit.vue


pages/addPlace/addPlace.vue → pagesSub/addPlace/addPlace.vue


+ 1 - 1
pages/appraise/appraise.vue

@@ -203,7 +203,7 @@ export default {
 		// 点击每一个评价回调
 		handleGoDetail(item) {
 			uni.navigateTo({
-				url: `/pages/appraiseDetail/appraiseDetail?id=${item.id}`
+				url: `/pagesSub/appraiseDetail/appraiseDetail?id=${item.id}`
 			})
 		},
 		// 切换分段器时的回调

pages/appraiseDetail/appraiseDetail.vue → pagesSub/appraiseDetail/appraiseDetail.vue


pages/collect/collect.vue → pagesSub/collect/collect.vue


+ 2 - 2
pages/common/common.vue

@@ -92,7 +92,7 @@ export default {
 			// console.log(item)
 			const info = JSON.stringify(item)
 			uni.navigateTo({
-				url: `/pages/addOrEdit/addOrEdit?type=2&info=${info}`
+				url: `/pagesSub/addOrEdit/addOrEdit?type=2&info=${info}`
 			})
 		},
 		// 右侧选项内容删除按钮回调
@@ -126,7 +126,7 @@ export default {
 		// 添加按钮回调
 		handleClickAdd() {
 			uni.navigateTo({
-				url: '/pages/addOrEdit/addOrEdit?type=1'
+				url: '/pagesSub/addOrEdit/addOrEdit?type=1'
 			})
 		}
 	}

+ 2 - 2
pages/complaint/complaint.vue

@@ -277,11 +277,11 @@ export default {
 			// console.log(res)
 			if (res.code === 200) {
 				uni.navigateTo({
-					url: `/pages/complaintStatus/complaintStatus?status=1`
+					url: `/pagesSub/complaintStatus/complaintStatus?status=1`
 				})
 			} else {
 				uni.navigateTo({
-					url: `/pages/complaintStatus/complaintStatus?status=2`
+					url: `/pagesSub/complaintStatus/complaintStatus?status=2`
 				})
 			}
 		},

+ 3 - 3
pages/complaintProgress/complaintProgress.vue

@@ -150,7 +150,7 @@ export default {
 						// console.log(res)
 						if (res.code === 200) {
 							uni.redirectTo({
-								url: '/pages/myComplaint/myComplaint'
+								url: '/pagesSub/myComplaint/myComplaint'
 							})
 						}
 					}
@@ -159,8 +159,8 @@ export default {
 		},
 		// 点击进度条图片回调
 		handleClickImg(url, index) {
-			console.log(url)
-			console.log(index)
+			// console.log(url)
+			// console.log(index)
 			if (this.videoContext) {
 				this.videoContext.stop()
 			}

+ 1 - 1
pages/complaintStatus/complaintStatus.vue

@@ -40,7 +40,7 @@ export default {
 		handleClickBtn() {
 			if (this.status === '1') {
 				uni.reLaunch({
-					url: '/pages/myComplaint/myComplaint'
+					url: '/pagesSub/myComplaint/myComplaint'
 				})
 			} else {
 				uni.navigateBack(1)

pages/coupon/coupon.vue → pagesSub/coupon/coupon.vue


pages/couponCenter/couponCenter.vue → pagesSub/couponCenter/couponCenter.vue


pages/detailInfo/detailInfo.vue → pagesSub/detailInfo/detailInfo.vue


+ 2 - 2
pages/evaluate/evaluate.vue

@@ -244,7 +244,7 @@ export default {
 				})
 				setTimeout(() => {
 					uni.reLaunch({
-						url: `/pages/evaluateStatus/evaluateStatus?status=1&hotelId=${this.hotelId}`
+						url: `/pagesSub/evaluateStatus/evaluateStatus?status=1&hotelId=${this.hotelId}`
 					})
 				}, 1500)
 			} else {
@@ -255,7 +255,7 @@ export default {
 				})
 				setTimeout(() => {
 					uni.navigateTo({
-						url: `/pages/evaluateStatus/evaluateStatus?status=2&hotelId=${this.hotelId}`
+						url: `/pagesSub/evaluateStatus/evaluateStatus?status=2&hotelId=${this.hotelId}`
 					})
 				}, 1500)
 			}

+ 2 - 2
pages/evaluateStatus/evaluateStatus.vue

@@ -161,14 +161,14 @@ export default {
 		},
 		handleEvaluate(item) {
 			uni.navigateTo({
-				url: `/pages/evaluate/evaluate?bookingId=${item.id}&hotelId=${item.hotelId}&houseId=${item.houseId}`
+				url: `/pagesSub/evaluate/evaluate?bookingId=${item.id}&hotelId=${item.hotelId}&houseId=${item.houseId}`
 			})
 		},
 		// 点击按钮回调
 		handleClickBtn() {
 			if (this.status === '1') {
 				uni.reLaunch({
-					url: '/pages/myEvaluate/myEvaluate'
+					url: '/pagesSub/myEvaluate/myEvaluate'
 				})
 			} else {
 				uni.navigateBack(1)

pages/home/home.vue → pagesSub/home/home.vue


+ 1 - 1
pages/likeList/likeList.vue

@@ -66,7 +66,7 @@ export default {
 		},
 		handleGoMyHome(item) {
 			uni.navigateTo({
-				url: `/pages/myHome/myHome?userId=${item.id}`
+				url: `/pagesSub/myHome/myHome?userId=${item.id}`
 			})
 		}
 	}

+ 1 - 1
pages/myComplaint/myComplaint.vue

@@ -83,7 +83,7 @@ export default {
 		// 点击每一个投诉订单的回调
 		handleGoPage(item) {
 			uni.navigateTo({
-				url: `/pages/complaintProgress/complaintProgress?id=${item.id}`
+				url: `/pagesSub/complaintProgress/complaintProgress?id=${item.id}`
 			})
 		}
 	}

+ 1 - 1
pages/myCoupon/myCoupon.vue

@@ -15,7 +15,7 @@
 				<view class="msg_top">关注领券中心</view>
 				<view>系统会不定时发放代金券</view>
 			</view>
-			<view class="banner_btn" @click="handleGoPage('/pages/couponCenter/couponCenter')">去逛逛</view>
+			<view class="banner_btn" @click="handleGoPage('/pagesSub/couponCenter/couponCenter')">去逛逛</view>
 		</view>
 
 		<!-- 代金券列表区域 -->

+ 2 - 2
pages/myEvaluate/myEvaluate.vue

@@ -167,14 +167,14 @@ export default {
 		//去评价按钮回调
 		handleGoPage(item) {
 			uni.navigateTo({
-				url: `/pages/evaluate/evaluate?bookingId=${item.id}&hotelId=${item.hotelId}&houseId=${item.houseId}`
+				url: `/pagesSub/evaluate/evaluate?bookingId=${item.id}&hotelId=${item.hotelId}&houseId=${item.houseId}`
 			})
 		},
 		// 点击每一个评价订单的回调
 		handleGoDetail(item) {
 			if (this.activeCurrent !== 0) {
 				uni.navigateTo({
-					url: `/pages/appraiseDetail/appraiseDetail?id=${item.id}`
+					url: `/pagesSub/appraiseDetail/appraiseDetail?id=${item.id}`
 				})
 			} else {
 				uni.navigateTo({

+ 1 - 1
pages/myHome/myHome.vue

@@ -232,7 +232,7 @@ export default {
 		handleGoDetail(item) {
 			if (item.approve === 2) {
 				uni.navigateTo({
-					url: `/pages/tweetDetail/tweetDetail?id=${item.id}&townId=${item.townId}`
+					url: `/pagesSub/tweetDetail/tweetDetail?id=${item.id}&townId=${item.townId}`
 				})
 			}
 		},

pages/newsDetail/newsDetail.vue → pagesSub/newsDetail/newsDetail.vue


+ 1 - 1
pages/newsList/newsList.vue

@@ -95,7 +95,7 @@ export default {
 		handleGoDetail(item) {
 			let info = encodeURIComponent(JSON.stringify(item))
 			uni.navigateTo({
-				url: `/pages/newsDetail/newsDetail?info=${info}`
+				url: `/pagesSub/newsDetail/newsDetail?info=${info}`
 			})
 		},
 		// 获取富文本信息回调

pages/rimDetail/rimDetail.vue → pagesSub/rimDetail/rimDetail.vue


+ 2 - 2
pages/send/send.vue

@@ -287,7 +287,7 @@ export default {
 			this.andList = this.andList.filter((ele) => ele.isCheck)
 			const list = JSON.stringify(this.andList)
 			uni.navigateTo({
-				url: `/pages/addPlace/addPlace?list=${list}&townId=${this.townId}`
+				url: `/pagesSub/addPlace/addPlace?list=${list}&townId=${this.townId}`
 			})
 		},
 		// 全局自定义事件
@@ -367,7 +367,7 @@ export default {
 			this.$refs.popup.close()
 			let userId = uni.getStorageSync('userInfo').id
 			uni.redirectTo({
-				url: `/pages/myHome/myHome?userId=${userId}`
+				url: `/pagesSub/myHome/myHome?userId=${userId}`
 			})
 		},
 		// 点击图片回调

pages/set/set.vue → pagesSub/set/set.vue


+ 2 - 2
pages/tweetDetail/tweetDetail.vue

@@ -494,7 +494,7 @@ export default {
 		},
 		handleGoPageLike() {
 			uni.navigateTo({
-				url: `/pages/likeList/likeList?id=${this.info.id}`
+				url: `/pagesSub/likeList/likeList?id=${this.info.id}`
 			})
 		},
 		// 相关推文点击爱心回调
@@ -613,7 +613,7 @@ export default {
 		},
 		handleGoMyHome(userId) {
 			uni.navigateTo({
-				url: `/pages/myHome/myHome?userId=${userId}`
+				url: `/pagesSub/myHome/myHome?userId=${userId}`
 			})
 		}
 	}

pages/web/web.vue → pagesSub/web/web.vue


File diff suppressed because it is too large
+ 2 - 0
util/cos-wx-sdk-v5.min.js


+ 1 - 1
util/cos.js

@@ -1,4 +1,4 @@
-let COS = require('cos-wx-sdk-v5')
+let COS = require('./cos-wx-sdk-v5.min.js')
 export const cos = new COS({
 	SecretId: 'AKIDJSP9gz469yZv77tQjotsgHguvjIgtvkL',
 	SecretKey: 'b3MVRD1g8RYS9g195oMkvukQvDKZfbOz',