auto

center/memberinfo.vue

@@ -32,6 +32,7 @@
 				<u-cell title="生日" :value="memberInfo.birthdayTime||'未设置'" @click="timeShow = true" :isLink="true"></u-cell>
 				<u-cell title="会员等级" :value="memberInfo.levelName"></u-cell>
 			</u-cell-group>
+			<u-button text="取消登录" type="warning" @click="clearStorage" style="margin-top: 30rpx;"></u-button>
 			<u-datetime-picker
 				:show="timeShow"
 				:minDate="new Date().getTime()-365*100*24*3600*1000"
@@ -99,6 +100,15 @@
 
 		},
 		methods: {
+			clearStorage(){
+				uni.clearStorage();
+				uni.showToast({
+					title:'清楚完成,请手动重新进入小程序',
+					icon:'none',
+					complete() {
+					}
+				})
+			},
 			getMemberInfo(){
 				this.$u.api.memberInfo({id:this.vuex_user_info.userid}).then(res=>{
 					this.memberInfo = res.data;

center/recharge.vue

@@ -15,12 +15,28 @@
 				<view class="title">充值</view>
 				<view class="inner u-flex u-row-around u-flex-wrap">
 					<view class="num-item" 
-						:class="{active:activeIndex == index}" 
+						:class="{active:activeIndex == index&&!usecustomize}" 
 						@click="numClick(index)"
 						v-for="(item,index) in numItem" :key="item">
 						¥ {{item}}
 					</view>
 				</view>
+				<view class="customize" :class="{active:usecustomize}" >
+					<u--input
+						prefixIcon="rmb"
+						type="number"
+					    placeholder="自定义金额"
+					    border="surround"
+					    v-model="customizeVal"
+						clearable
+					></u--input>
+				</view>
+				<view class="rule-wrap u-flex">
+					<u-checkbox-group v-model="checked" @change="checkboxChange" placement="row">
+						<u-checkbox activeColor="#00A447" name="同意" label="点击确认充值，即表示您已经同意"></u-checkbox>
+					</u-checkbox-group>
+					<text class="link" @click="$u.route('/credits/regulation',{regulationName:'充值协议'})">《充值协议》</text>
+				</view>
 				<view class="full-btn" @click="submit">充 值</view>
 			</view>
 		</view>
@@ -31,6 +47,9 @@
 	export default {
 		data() {
 			return {
+				checked:false,
+				checkboxVal:null,
+				customizeVal:null,
 				activeIndex:0,
 				numItem:[500,10000,15000]
 				
@@ -41,20 +60,64 @@
 		},
 		onLoad() {
 
+		},
+		computed:{
+			usecustomize:function(){
+				if(this.customizeVal){
+					return true
+				}else{
+					return false
+				}
+			}
 		},
 		methods: {
 			numClick(index){
+				this.customizeVal = '';
 				this.activeIndex = index
 			},
 			submit(){
-				let num = this.numItem[this.activeIndex];
+				// console.log('usecustomize',this.usecustomize);
+				if(!this.checkboxVal){
+					uni.showToast({
+						title:'请先同意充值协议',
+						icon:'none'
+					})
+					return
+				}
+				let num = Number(this.usecustomize?this.customizeVal:this.numItem[this.activeIndex]);
 				console.log('num',num);
+				if(!num){
+					uni.showToast({
+						title:'请正确输入金额',
+						icon:'error'
+					})
+					return
+				}
 				return
-				this.$u.api.charge({num:num}).then(res=>{
+				let payParams={
+					
+				};
+				this.$u.api.gotoPay(payParams).then(res=>{
+					this.payResult = res.data.payResult;
 					console.log('res',res.data);
 				}).catch(err=>{
 					console.log('charge',err);
 				})
+			},
+			wxPay(){
+				uni.requestPayment({
+					... this.payResult,
+				    "provider": "wxpay",
+				    success(res) {
+						uni.reLaunch({url: '/center/center'})
+					},
+				    fail(e) {
+						console.log('wxPayfail',e);
+					}
+				})				
+			},
+			checkboxChange(e){
+				this.checkboxVal = e[0];
 			}
 		}
 	}
@@ -105,4 +168,31 @@ page{
 		background-color: #FFB600;;
 	}
 }
+.customize{
+	&.active{
+		/deep/ .u-input{
+			border-color: #00A447!important;
+		}
+	}
+	// /deep/ .u-input{
+	// 	background-color: #bababa;
+	// 	border-color: #bababa;
+	// 	input{
+	// 		color: #fff!important;
+	// 		height: 70rpx;
+	// 		font-size: 50rpx!important;
+	// 		text-align: center!important;
+	// 		&::-webkit-input-placeholder{
+	// 			color: red!important;
+	// 		}
+	// 	}
+	// }
+}
+
+.rule-wrap{
+	margin: 40rpx auto;
+	.link{
+		color: #00A447;
+	}
+}
 </style>

common/request.js

@@ -77,7 +77,7 @@ module.exports = (vm) => {
 			if (custom.toast !== false) {
 				uni.$u.toast(data.msg)
 			}
-			if(data.msg == "令牌不能为空" || data.code == 401){
+			if(data.msg == "令牌验证失败" || data.msg == "令牌不能为空" || data.code == 401){
 				unlogin()
 			}
 			

credits/credits.vue

@@ -11,7 +11,7 @@
 			<view class="inner">
 				<view class="top u-flex u-row-between">
 					<text>积分商城</text>
-					<view class="right u-flex" @click="$u.route('/credits/regulation')">
+					<view class="right u-flex" @click="$u.route('/credits/regulation',{regulationName:'积分规则'})">
 						<u-icon name="error-circle" color="#fff" size="34rpx"></u-icon>
 						<text>规则</text>
 					</view>

credits/regulation.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<u-navbar
-			title="积分规则"
+			:title="title"
 			:autoBack="true"
 			 :safeAreaInsetTop="true"
 		>
@@ -18,18 +18,23 @@
 	export default {
 		data() {
 			return {
+				title:'',
+				regulationName:'',
 				content:'',
 			}
 		},
 		onShow() {	
-			this.getPageData()
-		},
-		onLoad() {
 			
+		},
+		onLoad(page) {
+			this.title = page.regulationName;;
+			this.regulationName = page.regulationName;
+			// console.log('page',page);
+			this.getPageData();
 		},
 		methods: {
 			getPageData(){
-				this.$u.api.memberCreditDesc({type:1,name:'积分规则'}).then(res=>{
+				this.$u.api.memberCreditDesc({type:1,name:this.regulationName}).then(res=>{
 					this.content = res.data.content
 					console.log('res',res.data);
 				}).catch(err=>{

pages/index/index.vue

@@ -28,7 +28,7 @@
 					正品保证
 				</view>
 				<view class="u-flex">
-					<u-icon :size="advantageSize" class="icon" :name="staticUrl+'/img/pei.png'"></u-icon>
+					<u-icon :size="advantageSize" class="icon" :name="staticUrl+'/img/memberservice.png'"></u-icon>
 					会员服务
 					</view>
 				<view class="u-flex">
@@ -132,8 +132,11 @@
 		onLoad() {
 			// let userInfo = uni.getStorageSync('userInfo');
 			// console.log('userInfo',userInfo);
-			this.getCenterImg();
+			let that = this;
 			this.swiperList();
+			setTimeout(()=>{
+				that.getCenterImg();
+			},200);
 		},
 		onShow() {
 			this.$refs.cartfixed.getCartList();

pages/login/login.vue

@@ -86,15 +86,23 @@
 				showAuthorizePhone: false,
 				customStyleUnOk:{},
 				customStyleOk:{'margin-left': '30px',color:'#00A447'},
+				backUrl:null,
 			};
 		},
 		onLoad() {
+			let that = this;
 			//获取屏幕高度，我的项目再store里已经取到了
 			uni.getSystemInfo({
 				success: (res) => {
 					this.screenHeight = res.windowHeight + "px"
 				}
-			})
+			});
+			uni.getStorage({
+				key: 'backUrl',
+				success: function (res) {
+					that.backUrl = '/'+res.data;
+				}
+			});
 		},
 		onShow() {
 			// uni.showLoading({
@@ -223,8 +231,9 @@
 							this.$u.vuex('vuex_member_info.name', '微信用户');
 							this.updateMemberInfo();
 						}else{
+							let url = this.backUrl&&this.backUrl.length>0?this.backUrl:'/pages/index/index';
 							uni.navigateTo({
-								url: '/pages/index/index'
+								url: url
 							})
 						}
 						// 下面需要获取微信头像和昵称
@@ -250,8 +259,9 @@
 					name:'微信用户'
 				};
 				this.$u.api.updateMemberInfo(params).then(res=>{
+					let url = this.backUrl&&this.backUrl.length>0?this.backUrl:'/pages/index/index';
 					uni.navigateTo({
-						url: '/pages/index/index'
+						url: url
 					})
 				}).catch(err=>{
 					console.log('err',err);

shopping/cart.vue

@@ -3,7 +3,7 @@
 		<u-navbar
 			title="购物车"
 			@leftClick="leftClick"
-			:autoBack="true"
+			:autoBack="false"
 			 :safeAreaInsetTop="true"
 		>
 		</u-navbar>
@@ -38,7 +38,7 @@
 								</view>
 								<view class="down">
 									<!-- <text class="discount">8.8折</text> -->
-									<text v-if="vuex_member_info.priceType>1" class="original-price gray line-through">¥ 133333</text>
+									<text v-if="vuex_member_info.priceType>1" class="original-price gray line-through">¥ {{item.salePrice}}</text>
 									<!-- <text class="sales gray">销量999+</text> -->
 								</view>
 							</view>
@@ -86,7 +86,7 @@
 						合计:{{totalPrice}}
 					</view>
 				</view>
-				<view class="btn active" v-if="selectGoods.length>0" @click="submitorder">去结算</view>
+				<view class="btn active" v-if="selectGoods.length>0&&cansubmit" @click="submitorder">去结算</view>
 				<view class="btn" v-else>去结算</view>
 			</view>
 		</view>
@@ -99,6 +99,7 @@
 		mixins: [MescrollMixin], // 使用mixin
         data() {
             return {
+				cansubmit:true,
 				hasAddr:false,
 				buyNowId:null,//立即购买id
 				buyNowName:'',//立即购买商品
@@ -233,6 +234,7 @@
 				this.mescroll.resetUpScroll();
 			},
 			leftClick(e){
+				uni.reLaunch({url: '/pages/index/index'});
 				console.log('leftClick',e);
 			},
 			// 切换全选状态
@@ -295,6 +297,7 @@
 			},
 			submitorder(){
 				// console.log('submitorder',this.selectGoods);
+				this.cansubmit = false;
 				let param = {};
 				if(!this.hasAddr){
 					// this.$refs.uToast.show({
@@ -322,6 +325,7 @@
 				})
 				this.$u.vuex('cartGoods', param.goodsList);
 				uni.$u.route('/shopping/submitorder', {});
+				this.cansubmit = true;
 				// // console.log('param',param);取消在这个获取订单结算详情
 				// this.$u.api.getSettlement(param).then(res=>{
 				// 	console.log('submitorder',res.data);

shopping/order.vue

@@ -23,6 +23,7 @@
 						:class="item.class"
 						@click="goOrderDetails(item.id)" :key="item.id">
 						<view class="top u-flex u-row-between">
+							<text v-if="item.orderType==2">[积分]</text>
 							<text>订单号：{{item.orderNum||''}}</text>
 							<text class="status">{{item.status|filterOrderState}}</text>
 						</view>
@@ -77,11 +78,11 @@
 				tabsCurrent:1,
 				tabsList:[
 					{name:'全部',status:'',},
-					{name:'待付款',status:'0',},
-					{name:'待出库',status:'1',},
-					{name:'待收货',status:'2'},
-					{name:'待评价',status:'3'},
-					{name:'退款/售后',status:'7'}
+					{name:'待付款',status:'0',badge:{isDot:false}},
+					{name:'待出库',status:'1',badge:{isDot:false}},
+					{name:'待收货',status:'2',badge:{isDot:false}},
+					{name:'待评价',status:'3',badge:{isDot:false}},
+					{name:'退款/售后',status:'7',badge:{isDot:false}}
 				],
 				status:'',
 				dataList:[],
@@ -94,7 +95,14 @@
 					5:[{name:'查看退款',fun:'viewRefund',class:'green'}],
 					// 6:[{name:'查看退款',fun:'viewRefund',class:'green'}],
 					7:[{name:'查看退款',fun:'viewRefund',class:'green'}]
-				}
+				},
+				orderBadge:{
+					noPayNum:0,
+					deliverNum:0,
+					collectNum:0,
+					commentNum:0,
+					refundNum:0,
+				},
 			}
 		},
 		computed: {
@@ -126,7 +134,8 @@
 		onShow() {
 			setTimeout(()=>{
 				this.hasfetch&&this.reloadList()
-			},500)
+			},500);
+			this.statisticsOrder();
 		},
 		methods: {
 			leftClick(){
@@ -299,6 +308,33 @@
 				        }
 				    }
 				})
+			},
+			statisticsOrder(){
+				this.$u.api.statisticsOrder().then(res=>{
+					let data = res.data || {};
+					this.orderBadge = Object.assign(this.orderBadge,data);
+					let {noPayNum,deliverNum,collectNum,commentNum,refundNum} = res.data;
+					let noPayNumindex = this.tabsList.findIndex(item => item.status == 0);
+					if(noPayNum>0){
+						this.tabsList[1].badge.isDot = true;
+					}
+					if(deliverNum>0){
+						this.tabsList[2].badge.isDot = true;
+					}
+					if(collectNum>0){
+						this.tabsList[3].badge.isDot = true;
+					}
+					if(commentNum>0){
+						this.tabsList[4].badge.isDot = true;
+					}
+					if(refundNum>0){
+						this.tabsList[5].badge.isDot = true;
+					}
+					// console.log('statisticsOrder',res.data);
+					// console.log('this.orderBadge',this.orderBadge);
+					}).catch(err=>{
+					console.log('memberInfo',err.data);
+				})
 			}
 		}
 	}

shopping/pay.vue

@@ -3,7 +3,7 @@
 		<u-navbar
 			title="收银台"
 			@leftClick="leftClick"
-			:autoBack="true"
+			:autoBack="false"
 			 :safeAreaInsetTop="true"
 		>
 		</u-navbar>
@@ -18,10 +18,10 @@
 						<view class="left">旭烁余额支付(¥ {{customBalance}})</view>
 						<u-radio :name="2" :disabled="customBalance<params.payAmount" activeColor="#00A447" size="36rpx"></u-radio>
 					</view>
-					<view :class="{disabled:customBalance<params.payAmount}" class="pay-way-item u-flex u-row-between">
-						<view class="left">积分支付(¥ {{customBalance}})</view>
-						<u-radio :name="3" :disabled="customBalance<params.payAmount" activeColor="#00A447" size="36rpx"></u-radio>
-					</view>
+				<!-- 	<view class="pay-way-item u-flex u-row-between">
+						<view class="left">积分支付(¥ {{credit}})</view>
+						<u-radio :name="3" :disabled="fromPage!=creditOrder&&customBalance<params.payAmount" activeColor="#00A447" size="36rpx"></u-radio>
+					</view> -->
 					<view class="pay-way-item u-flex u-row-between">
 						<view class="left">农商行支付</view>
 						<u-radio :name="4" activeColor="#00A447" size="36rpx"></u-radio>
@@ -37,7 +37,9 @@
 	export default {
 		data() {
 			return {
+				fromPage:'',
 				customBalance:'',
+				credit:'',
 				params:{
 					paymentMode:null,
 					orderId:'',
@@ -52,6 +54,8 @@
 			this.getMemberInfo();
 		},
 		onLoad(page) {
+			console.log('page',page);
+			this.fromPage = page.fromPage;
 			this.params.orderId = page.orderId;
 			this.params.openid = this.vuex_wechatOpenid;
 			this.params.payAmount = page.payAmount;
@@ -59,11 +63,22 @@
 		},
 		methods: {
 			leftClick(){
-				
+				uni.showModal({
+				    title: '提示',
+				    content: '是否放弃本次付款！',
+				    success: res => {
+						if (res.confirm) {
+							uni.navigateBack()
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+				    }
+				});
 			},
 			getMemberInfo(){
 				this.$u.api.memberInfo({id:this.vuex_user_info.userid}).then(res=>{
 					this.customBalance= res.data.balance;
+					this.credit= res.data.credit;
 				}).catch(err=>{
 					console.log('memberInfo',err.data);
 				})
@@ -95,7 +110,9 @@
 				        // "timestamp": 1597935292,        // 时间戳（单位：秒）
 				        // "sign": "A842B45937F6EFF60DEC7A2EAA52D5A0" // 签名，这里用的 MD5/RSA 签名
 				    },
-				    success(res) {},
+				    success(res) {
+						uni.$u.route('/shopping/paysuccess');
+					},
 				    fail(e) {
 						console.log('wxPayfail',e);
 					}

shopping/productdetails.vue

@@ -25,7 +25,7 @@
 				<view class="" v-if="vuex_member_info.priceType>1">
 					<text class="price">¥ <text class="price-num">{{details.vipPrice}}</text></text>
 					<text class="vip-icon">VIP</text>
-					<text class="exchangeCredit" v-if="details.isCredit==1">{{details.exchangeCredit}}</text>
+					<text class="exchangeCredit" v-if="details.isCredit==1">+{{details.exchangeCredit}}积分</text>
 				</view>
 				<view class="" v-else>
 					<text class="price">¥ <text class="price-num">{{details.salePrice}}</text></text>
@@ -38,10 +38,14 @@
 			</view>
 			<view class="name">{{details.goodsName}}</view>
 		</view>
+		<view class="specification info-line u-flex view-wrap" v-if="details.specification">
+			<view class="info-til">规格</view>
+			<view class="info-con u-flex">{{details.specification}}</view>
+		</view>
 		<view class="addr view-wrap">
 			<view class="addr-line u-flex">
-				<view class="addr-til">快递</view>
-				<view class="addr-con u-flex">
+				<view class="info-til">快递</view>
+				<view class="info-con u-flex">
 					包邮
 				</view>
 			</view>
@@ -176,11 +180,20 @@
 				this.addCart(id,'buyNow')
 			},
 			addCreditOrder(id){
-				let creditGoods = [];
-				creditGoods.push({id:this.details.id,quantity:1})
-				console.log('creditGoods',creditGoods);
-				this.$u.vuex('creditGoods',creditGoods);
-				uni.$u.route('/shopping/submitorder', {fromPage:'creditOrder'});
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '将扣除积分是否继续！',
+					success: res => {
+						if (res.confirm) {
+							let creditGoods = [];
+							creditGoods.push({id:that.details.id,quantity:1})
+							console.log('creditGoods',creditGoods);
+							that.$u.vuex('cartGoods',creditGoods);
+							uni.$u.route('/shopping/submitorder', {fromPage:'creditOrder'});
+						}
+					}
+				});
 			},
 			onShareAppMessage: function( options ){
 			  var that = this;
@@ -249,18 +262,22 @@
 		line-height: 50rpx;
 	}
 }
+.info-line{
+	margin-bottom: 20rpx;
+}
+.info-til{
+	color: #999;
+	margin-right: 40rpx;
+}
+.info-con{
+	color: #666;
+}
 .addr{
 	font-size: 30rpx;
 	.addr-line:not(:last-child){
-		margin-bottom: 20rpx;
-	}
-	.addr-til{
-		color: #999;
-		margin-right: 40rpx;
-	}
-	.addr-con{
-		color: #666;
+		
 	}
+	
 }
 .comment{
 	color: #999;

shopping/submitorder.vue

@@ -104,7 +104,10 @@
 					</view>
 				</view>
 				<view class="btn gray" v-if="orderTotalCredit&&userTotalCredit<orderTotalCredit">积分不够</view>
-				<view class="btn" v-else @click="submitOrder">去结算</view>
+				<view class="" v-else>
+					<view class="btn" v-if="cansubmit" @click="submitOrder">去结算</view>
+					<view class="btn gray" v-else>去结算</view>
+				</view>
 			</view>
 		</view>
     </view>
@@ -113,6 +116,7 @@
     export default {
         data() {
             return {
+				cansubmit:true,
 				fromPage:'',
 				useIntegral:false,
 				dataList:[],
@@ -132,12 +136,15 @@
 			// console.log('page',page);
 			// console.log('this.creditGoods',this.creditGoods);
 			this.fromPage = page.fromPage;
-			if(this.cartGoods>0&&this.fromPage!='creditOrder'){
-				this.orderInfo.goodsList = this.cartGoods;
-			}
-			if(this.creditGoods.length>0&&this.fromPage=='creditOrder'){
-				this.orderInfo.goodsList = this.creditGoods;
-			}
+			// if(this.cartGoods>0&&this.fromPage!='cart'){
+			// 	console.log('fromPagecart',this.fromPage);
+			// 	this.orderInfo.goodsList = this.cartGoods;
+			// }
+			// if(this.creditGoods.length>0&&this.fromPage=='creditOrder'){
+			// 	console.log('fromPagecreditOrder',this.fromPage);
+			// 	this.orderInfo.goodsList = this.creditGoods;
+			// }
+			this.orderInfo.goodsList = this.cartGoods;
 			this.settlement();
 		},
 		onShow() {
@@ -199,10 +206,15 @@
 				
 			},
 			settlement(){
+				let orderType = 1;
 				// console.log('settlement',this.selectGoods);
 				let param = {
 					receiveId:this.receive.id
 				};
+				if(this.fromPage == 'creditOrder'){
+					orderType = 2
+				}
+				param.orderType = orderType;
 				param.goodsList = this.orderInfo.goodsList.map(item=>{
 					return {goodsId:item.id||item.goodsId,quantity:item.quantity}
 				});
@@ -244,10 +256,16 @@
 			},
 			submitOrder(){
 				let that = this;
+				this.cansubmit = false;
+				let orderType = 1;
 				let param = {
 					receiveId:this.receive.id,
 					distribution:this.distribution,
 				};
+				if(this.fromPage == 'creditOrder'){
+					orderType = 2
+				}
+				param.orderType = orderType;
 				param.goodsList = this.orderInfo.goodsList.map(item=>{
 					return {goodsId:item.id,quantity:item.quantity}
 				})
@@ -259,12 +277,14 @@
 						param.longitude = res.longitude;
 						that.$u.api.submitOrder(param).then(res=>{
 							console.log('res',res.data);
+							that.cansubmit = true;
 							uni.$u.route('/shopping/pay', {
 								orderId: res.data.orderId,
-								// openid: that.vuex_wechatOpenid,
+								fromPage:this.fromPage,
 								payAmount:res.data.payAmount
 							});
 						}).catch(err=>{
+							that.cansubmit = true;
 							console.log('submitOrder',err);
 						})
 					},

utils/filter.js

@@ -44,7 +44,7 @@ Vue.filter("filterOrderState", function(val) {
 
 // 结账方式
 Vue.filter("filterPayType", function(val) {	
-	let payTypeList = ['', '微信', '余额', '积分'];
+	let payTypeList = ['', '微信', '余额', '积分','农商行支付'];
 	return payTypeList[val]
 });
 

xushuo/about.vue

@@ -38,11 +38,13 @@
 					</view>
 				</view>
 				<!-- <img :src="pageData.uxImg" style="width: 100%;" alt=""> -->
-				<view class="map-wrap" @click="mapClick">
+				<view class="map-wrap">
 					<map style="width: 100%; height: 340rpx;" 
+						@tap="mapClick"
 						:latitude="curNow==0?xsLatitude:shopLatitude" 
 						:longitude="curNow==0?xsLongitude:shopLongitude" :markers="covers">
 					</map>
+					<u-button text="导航"  @click="mapClick"></u-button>
 				</view>
 			</view>
 		</view>

xushuo/dynamicdetails.vue

@@ -23,13 +23,15 @@
 			</view>
 			
 			<view class="" v-if="type=='swiperDetail'">
-				<u--image :src="swiperDetails.sliderImg" :showLoading="true" width="100%" mode="aspectFill"></u--image>
-				<view class="" v-html="swiperDetails.detail"></view>
+				<u--image :src="swiperDetails.sliderImg" :showLoading="true" width="100%" mode="aspectFit"></u--image>
+				<!-- <view class="" v-html="swiperDetails.detail"></view> -->
+				<u-parse :content="swiperDetails.detail"></u-parse>
 			</view>
 			<view v-else class="content-wrap">
-				<u--image :src="pageData.mainImg" :showLoading="true" width="100%" mode="aspectFill"></u--image>
+				<u--image :src="pageData.mainImg" :showLoading="true" width="100%" mode="aspectFit"></u--image>
 				<view class="content">
-					{{pageData.content}}
+					<u-parse :content="pageData.content"></u-parse>
+					<!-- {{pageData.content}} -->
 				</view>
 			</view>
 		</view>

xushuo/xushuo.vue

@@ -24,7 +24,7 @@
 					class="image" :src="staticUrl+'/img/xushuo-index-02.png'" width="101rpx" height="101rpx"></u--image>
 					商行产品
 				</view>
-				<view class="nav-item" @click="$u.route('/xushuo/vrlist')">
+				<view class="nav-item" @click="vrClick">
 					<u--image class="image" :src="staticUrl+'/img/xushuo-index-03.png'" width="101rpx" height="101rpx"></u--image>
 					VR探访
 				</view>
@@ -156,6 +156,10 @@
 				uni.$u.route('/xushuo/dynamicdetails', {
 					id: id
 				});
+			},
+			vrClick(){
+				uni.showToast({title:'暂未开发',icon:'none'});
+				// uni.$u.route('/xushuo/vrlist')
 			}
 		}
 	}