品酒网点和活动

manifest.json

@@ -60,7 +60,11 @@
             "urlCheck" : false,
             "minified" : true
         },
-        "permission" : {}
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取用户附近的商家"
+            }
+        }
     },
     "h5" : {
         "title" : "喂喂商城",

pages.json

@@ -315,6 +315,30 @@
                 "navigationBarTitleText" : "文章详情"
             }
         },
+		
+		{
+		    "path" : "pages/activity/locList",
+		    "style" : {
+		        "navigationBarTitleText" : "品酒网点"
+		    }
+		},
+		
+		
+		{
+		    "path" : "pages/activity/detail",
+		    "style" : {
+		        "navigationBarTitleText" : "活动详情"
+		    }
+		},
+		{
+		    "path" : "pages/activity/memberlist",
+		    "style" : {
+		        "navigationBarTitleText" : "活动报名人员"
+		    }
+		},
+		
+		
+		
         {
             "path" : "pages/poster/index",
             "style" : {

pages/activity/detail.vue

@@ -0,0 +1,507 @@
+<template>
+	<view class="content">
+		<image class="banner" :src="info.activity.image">
+		</image>
+		<view class="aInfo">
+			<view class="atitle">
+				{{info.activity.activity_title}}
+			</view>
+
+
+			<view class="aitem">
+				<view>{{info.activity.title1}}</view>
+				<view>{{info.activity.content1}}</view>
+			</view>
+
+
+			<view class="aitem">
+				<view>{{info.activity.title2}}</view>
+				<!-- <view>{{ parse.filterTime(info.activity.start_time) }}至{{ parse.filterTime(info.activity.end_time) }}</view> -->
+				<view>{{info.activity.content2}}</view>
+			</view>
+
+			<view class="aitem">
+				<view>{{info.activity.title3}}</view>
+				<view class="aAddress">{{info.activity.content3}}</view>
+				<view class="aoperate">
+					<image
+						src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/47a789f04633b188498bb700002e2841.png">
+					</image>
+					<view></view>
+					<image @click="callPhone"
+						src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/d90e0ad7eb6fd669e1103fb241325593.png">
+					</image>
+				</view>
+			</view>
+
+
+
+		</view>
+
+
+
+
+
+		<view class="aInfo" style="margin-top: 22rpx;padding-top: 24rpx;">
+
+			<view class="mTip">
+				<view class="mTitle">
+					<view></view>
+					<view>报名人员</view>
+				</view>
+
+				<view class="mMore" @click="goMore">
+					<view>更多</view>
+					<image
+						src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/24ea2b5e78be1a4a66c94cdd670edb91.png">
+					</image>
+				</view>
+			</view>
+
+			<view class="mList">
+				<view class="mItem" v-for="(item,index) in info.user_list" :key='index'>
+
+					<image :src="item.avatar">
+					</image>
+					<view>{{item.username}}</view>
+
+				</view>
+			</view>
+			
+			<view v-if="!info.user_list.length" style='color:#999;text-align:center;margin:50rpx 0;font-size:30rpx'>暂无数据</view>
+
+		</view>
+
+
+
+		<view class="aInfo" style="margin-top: 22rpx;padding-top: 24rpx;">
+
+			<view class="mTip">
+				<view class="mTitle">
+					<view></view>
+					<view>活动介绍</view>
+				</view>
+
+
+			</view>
+
+
+			<rich-text :nodes="info.activity.activity_detail"></rich-text>
+
+
+
+		</view>
+
+
+		<view class="bot">
+
+			<button class="btn1" open-type="share">
+				<image
+					src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/dcc924cd0cd143a5e5c467ec74838c3f.png">
+				</image>
+				<view>
+					活动分享
+				</view>
+			</button>
+
+
+		<button class="btn2" @click="btnConfirm" >
+				活动报名
+			</button>
+			
+			
+
+	<!-- 		<button class="btn2" @click="btnConfirm" v-if="infi.activity.activity_status==1&&phone">
+				活动报名
+			</button> -->
+
+
+	<!-- 		<button class="btn2"   v-if="infi.activity.activity_status==1&&!phone"   open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">
+				活动报名
+			</button> -->
+
+
+			<view class="btn3" v-if="infi.activity.activity_status==0">
+				活动结束
+			</view>
+
+		</view>
+
+
+	</view>
+	</view>
+</template>
+<script module="parse" lang="wxs">
+	module.exports = {
+		filterTime: function(time) {
+
+			console.log(time)
+
+			var nowDate = getDate(time * 1000);
+			var year = nowDate.getFullYear();
+			var month = nowDate.getMonth() + 1;
+			var date = nowDate.getDate();
+			var hours = nowDate.getHours();
+			var minutes = nowDate.getMinutes();
+			var seconds = nowDate.getSeconds();
+
+			month = month > 9 ? month : '0' + month;
+			date = date > 9 ? date : '0' + date;
+			hours = hours > 9 ? hours : '0' + hours;
+			minutes = minutes > 9 ? minutes : '0' + minutes;
+			seconds = seconds > 9 ? seconds : '0' + seconds;
+
+			return year + '-' + month + '-' + date + " " + hours + ":" + minutes + ":" + seconds;
+
+		}
+	}
+</script>
+<script>
+	// pages/backstage/index/index.js
+	var app = getApp();
+	// import { request } from '../../../utils/request.js';
+	export default {
+		data() {
+			return {
+				info: "",
+				id: "",
+				phone:""
+			};
+		}
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		,
+		onLoad: function(options) {
+			this.id = options.id || 4
+			this.getinfo();
+		},
+		/**
+		 * 生命周期函数--监听页面初次渲染完成
+		 */
+
+		onShow: function() {},
+		/**
+		 * 生命周期函数--监听页面隐藏
+		 */
+		onPullDownRefresh: function() {},
+		/**
+		 * 页面上拉触底事件的处理函数
+		 */
+		onReachBottom: function() {},
+		/**
+		 * 用户点击右上角分享
+		 */
+		onShareAppMessage: function() {
+			return {
+				title: this.info.activity.activity_title,
+				imageUrl: this.info.activity.image,
+				path: ''
+			}
+		},
+		methods: {
+			async decryptPhoneNumber(e){
+				var that = this
+				console.log(e)
+				
+				let res = await that.$api.request('/Activity/activity_join', 'GET', {
+					code: e.detail.code
+				});
+				
+				if(res){
+					this.phone = res
+				}
+				
+				
+			},
+			btnConfirm() {
+
+				var that = this;
+
+				uni.showModal({
+					title: '提示',
+					content: '确认报名?',
+					async success(res) {
+						if (res.confirm) {
+
+							let res = await that.$api.request('/Activity/activity_join', 'GET', {
+								activity_id: that.id,
+								phone:that.phone||''
+							});
+
+							if (res) {
+
+								uni.showToast({
+									title: '报名成功'
+								})
+
+							}
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+
+
+
+
+			},
+			goMore() {
+				uni.navigateTo({
+					url: "/pages/activity/memberlist"
+				})
+			},
+			callPhone() {
+
+			},
+			async getinfo() {
+				var that = this;
+
+				let res = await this.$api.request('/Activity/detail', 'GET', {
+					id: this.id
+				});
+
+				console.log(res)
+				if (res) {
+
+					res.activity.activity_detail = res.activity.activity_detail.replace(/\<img/gi,
+						'<img style="max-width:100%;height:auto;display:block;"');
+
+					this.info = res
+
+				}
+
+			},
+
+
+		}
+	};
+</script>
+<style>
+	page {
+		background: #F6F3F7;
+	}
+
+	.content {
+		padding-bottom: 120rpx;
+	}
+
+	.banner {
+		width: 100%;
+
+	}
+
+
+	.aInfo {
+
+		width: 100%;
+		padding: 46rpx 40rpx 28rpx;
+		box-sizing: border-box;
+		background: #fff;
+	}
+
+	.atitle {
+		font-size: 40rpx;
+		color: #010101;
+		font-weight: 700;
+		text-align: center;
+		padding: 0 140rpx 38rpx;
+		border-bottom: 1px solid #E5E2E5;
+	}
+
+
+	.aitem {
+		margin-top: 30rpx;
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+
+	.aitem>view:nth-child(1) {
+		font-size: 26rpx;
+		color: #8E8E8E;
+	}
+
+	.aitem>view:nth-child(2) {
+		font-size: 26rpx;
+		color: #000000;
+		margin-left: 22rpx;
+
+	}
+
+	.aAddress {
+		width: 360rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.aoperate {
+		display: flex;
+		align-items: center;
+		position: absolute;
+		right: 0;
+	}
+
+	.aoperate>view {
+		width: 1px;
+		height: 36rpx;
+		background: #818181;
+		margin: 0 14rpx;
+	}
+
+	.aoperate>image {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
+
+	.mTip {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+
+	.mTitle {
+		display: flex;
+		align-items: center;
+		justify-content: space-be
+	}
+
+	.mTitle>view:nth-child(1) {
+		width: 8rpx;
+		height: 34rpx;
+		background: #F94E6F;
+		border-radius: 4rpx;
+	}
+
+
+	.mTitle>view:nth-child(2) {
+		font-size: 32rpx;
+		color: #000000;
+		margin-left: 10rpx;
+	}
+
+
+	.mMore {
+		display: flex;
+		align-items: center;
+
+	}
+
+	.mMore>view {
+		font-size: 24rpx;
+		color: #8E8E8E;
+	}
+
+
+	.mMore>image {
+		width: 12rpx;
+		margin-left: 10rpx;
+		height: 20rpx;
+	}
+
+
+	.mList {
+		margin-top: 56rpx;
+		display: flex;
+	}
+
+	.mItem {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin-right: 30rpx;
+	}
+
+	.mItem>view {
+		font-size: 28rpx;
+		color: #010101;
+		margin-top: 20rpx;
+	}
+
+
+	.mItem>image {
+		width: 110rpx;
+		height: 110rpx;
+		border-radius: 50%;
+	}
+
+
+
+	rich-text {
+		margin-top: 30rpx;
+	}
+
+
+
+	.bot {
+
+		width: 100%;
+		height: 112rpx;
+		position: fixed;
+		background: #fff;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		padding: 0 30rpx;
+	}
+
+
+	.btn1 {
+		width: 224rpx;
+		height: 86rpx;
+
+		display: flex;
+		align-items: center;
+		background: #FB4C6F;
+		justify-content: center;
+		border-radius: 60rpx;
+	}
+
+
+	.btn1>image {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 12rpx;
+	}
+
+
+	.btn1>view {
+		font-size: 28rpx;
+		color: #fff;
+	}
+
+
+	.btn2 {
+		width: 224rpx;
+		height: 86rpx;
+
+		display: flex;
+		align-items: center;
+		background: #FB4C6F;
+		justify-content: center;
+		border-radius: 60rpx;
+		color: #FFF;
+	}
+
+
+	.btn3 {
+		width: 224rpx;
+		height: 86rpx;
+
+		display: flex;
+		align-items: center;
+		background: #8E8E8E;
+		justify-content: center;
+		border-radius: 60rpx;
+		color: #FFF;
+	}
+
+	button {
+		margin: 0;
+	}
+</style>

pages/activity/locList.vue

@@ -0,0 +1,266 @@
+<template>
+	<block>
+		<view class="item" v-for="(item,index) in list" :key='index' @click="opMap(item.lat,item.lng)">
+			<image class="sImg" :src="item.image"
+				mode=""></image>
+			<view class="info">
+
+				<view class="ititle">
+
+					<view>{{item.storename}}</view>
+					<image
+						src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/758f62af7f9f4e5b1d96b51619d07b19.png"
+						mode=""></image>
+
+				</view>
+
+
+				<view class="iphone">
+					<image
+						src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/658f859a103b4c4f20e3645fa557b592.png"
+						mode=""></image>
+					<view>{{item.phone}}</view>
+				</view>
+
+				<view class="iaddress">
+
+					<view class="addressLeft">
+						<image
+							src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/f598a75a5fcbbcb06f90f2858fbf08af.png"
+							mode=""></image>
+						<view>{{item.storeaddress}}</view>
+					</view>
+
+					<view class="addressRight">
+						100m
+					</view>
+
+				</view>
+
+			</view>
+		</view>
+    <view v-if="!list.length" style='color:#999;text-align:center;margin:150rpx 0;font-size:30rpx'>暂无数据</view>
+
+	</block>
+</template>
+<script module="parse" lang="wxs">
+	module.exports = {
+
+		filterNum: function(value) {
+
+
+			var value = value + ''
+
+			console.log(value)
+
+
+			var card = value.replace(getRegExp('(/^(\d{4})\d+(\d{4})$/)', 'g'), '$1 **** **** $2')
+
+			return card
+
+
+		}
+
+
+	}
+</script>
+<script>
+	// pages/tabbar/index/index.js
+	var app = getApp();
+
+	export default {
+		data() {
+			return {
+				navIndex: 0,
+				list: [
+
+					// {
+					// 	account: "hhD",
+					// 	bank_name: "农业银行",
+					// 	card_no: "6228481561378773113",
+					// 	card_no_end: "3113",
+					// 	create_time: "1659088920",
+					// 	id: "7",
+					// 	is_default: "0",
+					// 	status: "1",
+					// 	uniacid: "3",
+					// 	update_time: "1659088920",
+					// 	user_id: "1"
+					// }
+				],
+				loaded: false,
+				page: 1,
+				type: '',
+				pageSize: 10
+			};
+		},
+		onLoad: function(options) {
+			var that = this;
+			uni.getLocation({
+				 type: 'gcj02',
+				 success (res) {
+					 
+				  that.latitude = res.latitude
+				   that.longitude = res.longitude
+				   
+				   that.getlist();
+				
+				 }
+			})
+			
+		},
+
+		onShow() {
+		},
+		onPullDownRefresh: function() {},
+		onReachBottom: function() {
+			this.loaded || this.getlist();
+		},
+		onShareAppMessage: function() {},
+		methods: {
+			opMap(lat,lng) {
+				uni.openLocation({
+					latitude: lat,
+					longitude: lng,
+					success(e) {
+
+					}
+				})
+			},
+			toPage(e) {
+				app.globalData.toPage(e);
+			},
+
+			init() {
+
+				this.page = 1
+				this.loaded = false
+				this.list = []
+
+			},
+
+			async getlist() {
+				var that = this;
+				let res = await this.$api.request('/Store/index', 'GET', {
+					page: this.page,
+					pagesize: this.pageSize,
+					lat: this.latitude,
+					lng: this.longitude,
+				});
+
+				console.log(res.list)
+				if (res) {
+					if (res.list.length > 0) {
+
+						this.list = this.list.concat(res.list);
+
+						this.page++;
+
+					} else {
+						this.loaded = true
+						this.$api.msg('没有更多数据');
+					}
+				}
+			}
+		}
+	};
+</script>
+<style>
+	page {
+		background: #F5F5F5;
+	}
+
+
+	.item {
+		background: #fff;
+		border-radius: 12rpx;
+		overflow: hidden;
+		margin: 30rpx;
+		display: flex;
+		align-items: center;
+		padding: 30rpx 22rpx;
+		box-sizing: border-box;
+	}
+
+
+	.sImg {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 12rpx;
+	}
+
+
+	.info {
+		margin-left: 17rpx;
+		flex: 1;
+	}
+
+	.ititle {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.ititle>image {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.ititle>view {
+		color: #010101;
+		font-size: 32rpx;
+	}
+
+
+	.iphone {
+		display: flex;
+		align-items: center;
+		margin: 12rpx 0;
+	}
+
+	.iphone>image {
+		width: 36rpx;
+		height: 36rpx;
+	}
+
+	.iphone>view {
+		font-size: 26rpx;
+		color: #8E8E8E;
+		margin-left: 4rpx;
+	}
+
+	.iaddress {
+		display: flex;
+		align-items: flex-start;
+		justify-content: space-between;
+
+	}
+
+	.addressLeft {
+		display: flex;
+		align-items: center;
+		align-items: flex-start;
+	}
+
+	.addressLeft>image {
+		width: 36rpx;  
+		height: 36rpx;
+	}
+
+	.addressLeft>view {
+		font-size: 26rpx;
+		width: 326rpx;  
+		color: #8E8E8E;
+		display: -webkit-box;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		margin-left: 4rpx;
+	}
+
+	.addressRight {
+		font-size: 26rpx;
+		color: #8E8E8E;
+	}
+</style>

pages/activity/memberlist.vue

@@ -0,0 +1,216 @@
+<template>
+    <view class="content">
+        <view class="box">
+            <view class="orderItem" v-for="(item, index) in list" :key="index">
+				<image class="goodImg" src="https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTLuLiaFYKXBMuc4a35Yv0f2dAlClwv2rqeZSOibsp7MQMoB47VV24FdrQaLhrmjYESqn08PKlic43x7A/132" ></image>
+                <view class="orderInfo">
+                    <view class="info1">
+                        <view>{{ item.pname||'张三' }}</view>
+                    </view>
+                    <view class="info2">
+                        <view>{{ parse.filterTime(item.createtime) }}</view>
+                    </view>
+					
+		
+                </view>
+            </view>
+			
+			
+			
+			    <view v-if="!list.length" style='color:#999;text-align:center;margin:150rpx 0;font-size:30rpx'>暂无数据</view>
+
+        </view>
+    </view>
+</template>
+<script module="parse" lang="wxs">
+module.exports = {
+	filterTime: function(time) {
+
+		console.log(time)
+
+		var nowDate = getDate(time * 1000);
+		var year = nowDate.getFullYear();
+		var month = nowDate.getMonth() + 1;
+		var date = nowDate.getDate();
+		var hours = nowDate.getHours();
+     var minutes = nowDate.getMinutes();
+     var seconds = nowDate.getSeconds();
+
+		month = month > 9 ? month : '0' + month;
+		date = date > 9 ? date : '0' + date;
+		hours = hours > 9 ? hours : '0' + hours;
+     minutes = minutes > 9 ? minutes : '0' + minutes;
+     seconds=seconds>9?seconds:'0'+seconds;
+
+		return year + '-' + month + '-' + date + " " + hours + ":" + minutes+ ":" + seconds;
+
+	}
+}
+</script>
+<script>
+// pages/backstage/index/index.js
+var app = getApp();
+// import { request } from '../../../utils/request.js';
+export default {
+    data() {
+        return {
+            page: 1,
+            list: [				
+			],
+            loaded: false,
+
+        };
+    }
+    /**
+     * 生命周期函数--监听页面加载
+     */,
+    onLoad: function (options) {
+ 
+        this.getlist();
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {},
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {},
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {},
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {},
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+        this.init();
+        this.getlist();
+        uni.stopPullDownRefresh();
+    },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+        this.loaded || this.getlist();
+    },
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {},
+    methods: {
+        async getlist() {
+            var that = this;
+			         let res = await this.$api.request('/Activity/index', 'GET', {
+			         	page: this.page,
+			         });
+					 
+					 console.log(res)
+			         if (res) {
+			         	if (res.list.length > 0) {
+			         
+			         		this.list = this.list.concat(res.list);
+			         
+			         		this.page++; 
+			         		
+			         	} else {
+			         		this.loaded = true 
+			         		this.$api.msg('没有更多数据');
+			         	}
+			         }
+        },
+
+        init() {
+           this.page = 1
+           this.loaded = false
+           this.list = []
+        }
+    }
+};
+</script>
+<style>
+	page {
+	    background: #fff;
+	}
+	
+	.content {
+	    margin: 26rpx;
+	    background: #fff;
+	    border-radius: 20rpx;
+	}
+	
+	.orderItem {
+	    display: flex;
+	    align-items: center;
+	    padding: 24rpx  20rpx;
+	    border-bottom: 1px solid #e4e5ee;
+		box-sizing: border-box;
+	}
+	
+	
+	.orderItem > image {
+	    width: 110rpx;
+	    height: 110rpx;
+	    border-radius: 12rpx;
+	}
+	
+	.orderInfo {
+	    display: flex;
+	    flex-direction: column;
+	    flex: 1;
+	    justify-content: space-between;
+	    margin-left:30rpx;
+	}
+	
+	.info1 {
+	    display: flex;
+	    align-items: center;
+	    justify-content: space-between;
+
+	}
+	
+	.info1 > view:nth-child(1) {
+	    font-size: 34rpx;
+	    width: 300rpx;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+		color: #010101;
+	}
+	
+	.info1 > view:nth-child(2) {
+	    font-size: 28rpx;
+	}
+	
+	.info2 {
+	    display: flex;
+	    align-items: center;
+	    justify-content: space-between;
+
+	    margin-top: 26rpx;
+	}
+	
+	.info2 > view:nth-child(1) {
+	    color: #8E8E8E;
+		font-size: 26rpx;
+	}
+	
+
+	
+	.color1 {
+	    color: #EC8E02 !important;
+	}
+	view{
+		font-size: 24rpx;
+	}
+		
+	.goodImg{
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%!important;
+	}
+</style>

pages/bindteam/index.vue

@@ -35,6 +35,7 @@
 			async bind() {
 							
 				var  userInfo = await this.$wechatMiniLogin(true);
+				
 				this.login(userInfo)
 							
 				let res = await this.$api.request('/team/add', 'GET', {

pages/index/index.vue

@@ -213,7 +213,24 @@ export default {
 				}) 
 	
 				
+			}else if(name == '品酒网点'){
+				
+				uni.navigateTo({
+					url:'/pages/activity/locList'
+				}) 
+	
+				
 			}
+			else if(name == '招募合伙人'){
+				
+				uni.navigateTo({
+					url:'/pages/activity/detail'
+				}) 
+				
+				
+			}
+			
+			
 			
 			
 			else{

pages/intergalShop/index.vue

@@ -7,8 +7,8 @@
 				src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/8/f566738e424f33a415dea22dc4e11eec.png"
 				class="ico-moon"></image>
 
-			<image mode="heightFix" :style="'height: ' + menuButton.height * 2 + 'rpx'" @tap="toPage"
-				data-url="/pages/tabbar/index/index" class="h-backBtn" v-else
+			<image mode="heightFix" :style="'height: ' + menuButton.height * 2 + 'rpx'" @click="toPage1"
+	        class="h-backBtn" v-else
 				src="https://ymyun-oss.oss-cn-hangzhou.aliyuncs.com/yidu_tc/public/upload/12/2847/41c5f36528b8f4204130c4977c1ec2c5.png">
 			</image>
 			<view class="userName">积分商城</view>
@@ -263,6 +263,14 @@
 				app.globalData.toPage(e);
 			},
 
+	       toPage1() {
+			   console.log(1)
+			   
+			   uni.switchTab({
+			   	url:'/pages/index/index'
+			   })
+			},
+			
 			toback() {
 				uni.navigateBack({
 					delta: 1

pages/product/product.vue

@@ -309,7 +309,8 @@
 				
 				console.log(product)
 				
-				product.desc = product.desc.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"');
+				
+				product.desc = product.desc.replace(/\<img/gi, '<img style="max-width:100%!important;height:auto!important"');
 				
 				console.log(product)
 				
@@ -469,6 +470,7 @@
 </script>
 
 <style lang='scss'>
+
 	page {
 		background: $page-color-base;
 		padding-bottom: 160upx;