no message

pages.json

@@ -146,25 +146,25 @@
 		"height": "220px",
 		"list": [{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/img/tabBar1.png",
-			"selectedIconPath": "static/img/tabBar1_s.png",
+			"iconPath": "/static/img/tabBar1.png",
+			"selectedIconPath": "/static/img/tabBar1_s.png",
 			"text": "首页"
 		}
 		, {
 			"pagePath": "pages/shoppingMall/shoppingMall",
-			"iconPath": "static/img/tabBar2.png",
-			"selectedIconPath": "static/img/tabBar2_s.png",
+			"iconPath": "/static/img/tabBar2.png",
+			"selectedIconPath": "/static/img/tabBar2_s.png",
 			"text": "商城"
 		}
 		, {
 			"pagePath": "pages/knapsack/knapsack",
-			"iconPath": "static/img/tabBar3.png",
-			"selectedIconPath": "static/img/tabBar3_s.png",
+			"iconPath": "/static/img/tabBar3.png",
+			"selectedIconPath": "/static/img/tabBar3_s.png",
 			"text": "背包"
 		}, {
 			"pagePath": "pages/mine/mine",
-			"iconPath": "static/img/tabBar4.png",
-			"selectedIconPath": "static/img/tabBar4_s.png",
+			"iconPath": "/static/img/tabBar4.png",
+			"selectedIconPath": "/static/img/tabBar4_s.png",
 			"text": "我的"
 		}]
 	}

pages/addressEdit/addressEdit.vue

@@ -119,7 +119,7 @@
 				this.$refs.form.validate().then(val => {
 					addressSaveApi(this.form).then(res => {
 						console.log(res, '提交新增地址')
-						wx.navigateTo({
+						wx.redirectTo({
 							url: "/pages/addressManage/addressManage"
 						})
 						wx.showToast({

pages/addressManage/addressManage.vue

@@ -53,7 +53,7 @@
 					let params = {
 						addressId: item.id,
 					}
-					this.$navigateTo("/pages/orderConfirm/orderConfirm", params)
+					this.$redirectTo("/pages/orderConfirm/orderConfirm", params)
 					getApp().globalData.selectAddrss = false
 				}
 			},

pages/drawCard_first/drawCard_first.vue

@@ -354,13 +354,14 @@
 				top: 0;
 				display: grid;
 				grid-template-columns: 1fr 1fr 1fr 1fr;
-
+				grid-template-rows: 1fr 1fr 1fr;
+				
 				.item {
 					display: inline-flex;
 					justify-content: center;
 					align-items: center;
 					position: relative;
-
+					
 					.kaBk {
 						width: 70%;
 						border-radius: 4px;

pages/index/index.vue

@@ -60,9 +60,8 @@
 			}
 		},
 		onLoad(query) {
-			console.log(query, 'query')
 			if (query.inviteId) {
-				getApp().globalData.inviteId = inviteId;
+				getApp().globalData.inviteId = query.inviteId;
 			} else {
 				const scene = decodeURIComponent(query.scene)
 				let inviteId = scene.split("=")[1]

pages/invite/invite.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<image class="bk" src="https://mall.rongtongh.cn/storage/img/invite/bk.png" mode=""></image>
 		<view class="page">
-			<image class="illustrate" src="https://mall.rongtongh.cn/storage/img/invite/button1.png" mode=""></image>
+			<image class="illustrate" @click="$navigateTo('/pages/rule/rule', {type: 6})" src="https://mall.rongtongh.cn/storage/img/invite/button1.png" mode=""></image>
 			<view class="box">
 				<view class="item">
 					<image mode="aspectFit" class="label1" src="https://mall.rongtongh.cn/storage/img/invite/text2.png"></image>
@@ -58,10 +58,15 @@
 		onLoad() {
 			this.getInviteList()
 		},
+		computed: {
+			userInfo() {
+				return wx.getStorageSync('userInfo')
+			}
+		},
 		onShareAppMessage() {
 			let userId = wx.getStorageSync('userId')
 			return {
-				title: '自定义转发标题222',
+				title: this.userInfo.nickName + '邀请你来宝可梦卡牌抽取喜欢的卡牌',
 				path: '/pages/index/index?inviteId=' + userId
 			}
 		},

pages/knapsack/knapsack.vue

@@ -61,8 +61,8 @@
 			</view>
 
 			<view class="buttons" v-if="!showCheck">
-				<image class="button" src="https://mall.rongtongh.cn/storage/img/knapsack/button3.png" mode="heightFix"></image>
-				<image class="button" @click="showCheck = true" src="https://mall.rongtongh.cn/storage/img/knapsack/button4.png"
+				<image class="button" @click="clickCheckType(2)" src="https://mall.rongtongh.cn/storage/img/knapsack/button3.png" mode="heightFix"></image>
+				<image class="button" @click="clickCheckType(1)" src="https://mall.rongtongh.cn/storage/img/knapsack/button4.png"
 					mode="heightFix">
 				</image>
 			</view>
@@ -80,10 +80,15 @@
 					</view>
 				</view>
 				<view class="right">
-					<image class="button" @click="cancelOrder" style="margin-right: 5px;"
-						src="https://mall.rongtongh.cn/storage/img/knapsack/button2.png" mode="heightFix"></image>
-					<image class="button" @click="toConfirmConfirm" src="https://mall.rongtongh.cn/storage/img/knapsack/button1.png"
-						mode="heightFix"></image>
+					<view class="button button1" @click="cancelOrder">
+						取消
+					</view>
+					<view class="button button2" v-if="checkType == 1" @click="toConfirmConfirm">
+						选择地址
+					</view>
+					<view class="button button2" v-if="checkType == 2" @click="decompose">
+						分解
+					</view>
 				</view>
 			</view>
 		</view>
@@ -166,6 +171,8 @@
 		data() {
 			return {
 				showCheck: false,
+				// 多选类型 1下单 2分解
+				checkType: 1,
 				activeIndex: 1,
 				list: [],
 				allCheck: false,
@@ -190,6 +197,10 @@
 			}
 		},
 		onShow() {
+			// 重置页面状态
+			this.cancelOrder()
+			this.selectIndex = []
+			this.showCheck = false
 			this.activeIndex = 1
 			this.$refs.ani.init({
 				duration: 100,
@@ -279,6 +290,11 @@
 					}
 				}
 			},
+			clickCheckType(type) {
+				// 下单或分解多选打开
+				this.checkType = type
+				this.showCheck = true
+			},
 			checkClick(e, item) {
 				console.log(item, 'item')
 				item.check = !item.check
@@ -306,6 +322,8 @@
 				// 获取商城订单列表
 				if(type) {
 					this.params2.status = type
+				} else {
+					this.params2.status = ''
 				}
 				packageOrderListApi(this.params2).then(res => {
 					console.log(res, '商城订单列表')
@@ -611,6 +629,21 @@
 
 				.button {
 					height: 30px;
+					padding: 0 20px;
+					border-radius: 15px;
+					font-size: 14px;
+					line-height: 30px;
+					margin-left: 15px;
+				}
+				.button1 {
+					height: 28px;
+					border: solid 1px #FF8015;
+					color: #FF8015;
+				}
+				.button2 {
+					// border: solid 1px #FF8015;
+					background: linear-gradient(180deg, #FFAD3D 0%, #FF740A 100%);
+					color: #fff;
 				}
 			}
 		}

pages/mine/mine.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="user">
 			<view class="userInfo">
-				<image @click="$navigateTo('/pages/user/user')" class="userPhoto" :src="userInfo.avatarUrl"></image>
+				<image @click="toUserInfo" class="userPhoto" :src="userInfo.avatarUrl"></image>
 				<view class="info">
 					<view class="name" v-if="hasLogin">
 						{{userInfo.nickName || ''}}
@@ -24,7 +24,7 @@
 						积分
 					</view>
 				</view>
-				<view class="box" @click="$redirectTo('/pages/coupon/coupon')">
+				<view class="box" @click="$navigateTo('/pages/coupon/coupon')">
 					<view class="value">
 						{{ userInfoDetail.couponNum || 0}}
 					</view>
@@ -93,6 +93,12 @@
 			}
 		},
 		methods: {
+			toUserInfo() {
+				this.$navigateTo('/pages/user/user')
+				if (this.isLogin) {
+					this.$navigateTo('/pages/user/user')
+				}
+			},
 			getUserInfo() {
 				userInfoApi().then(res => {
 					console.log(res, '详细用户信息')

pages/rule/rule.vue

@@ -126,6 +126,9 @@
 					case '5':
 						titleText = "first赏规则与说明"
 						break;
+					case '6':
+						titleText = "邀请好友规则与说明"
+						break;
 				}
 				this.title = titleText
 				wx.setNavigationBarTitle({