Merge branch 'dev' into chenxuelian

pages/detail/productsDetail/productsDetail.vue

@@ -60,6 +60,10 @@
 					<login @success="reOnLoad()" @fail="failToLoad()"></login>
 				</u-overlay>
 			</view>
+			<u-modal :show="showM" :content='content' closeOnClickOverlay="false" showCancelButton="true"
+				confirmText="升级VIP" @confirm="confirm" confirmColor="#0EBB5B">
+				<rich-text :nodes="content"></rich-text>
+			</u-modal>
 		</view>
 	</view>
 </template>
@@ -80,7 +84,9 @@
 				tagsArray: [],
 				showHeart: false,
 				detailList: [],
-				isLoad: true
+				isLoad: true,
+				showM: false,
+				content: '您暂无权限访问，请升级VIP访问'
 			}
 		},
 		onLoad(option) {
@@ -104,8 +110,8 @@
 					if (res.data.data.thumb) {
 						this.isThumb = true
 					}
-					if (res.data.code == 0) {
-						this.$toast.warn('没有权限访问')
+					if (res.data.msg == "没有权限访问" && uni.getStorageSync('loginToken')) {
+						this.showM = true
 					}
 					if (res.data.data) {
 						let detail = res.data.data
@@ -162,6 +168,11 @@
 			},
 			failToLoad() {
 				this.$toast.warn('登录失败请重试')
+			},
+			confirm() {
+				uni.navigateTo({
+					url: '../../../packageMy/memberCenter/memberCenter?ask=' + 1
+				})
 			}
 		}
 	}