修改

assets/http/api.js

@@ -5,7 +5,13 @@ import {http} from './service.js'
 //文件上传
 const uploadFile =(p)=> http.upload('blade-resource/oss/endpoint/put-file', {name:'file',filePath:p})
 
+
+const notice={
+	detail:p => http.get('blade-desk/notice/detail', {params:p}),
+}
+
 const platform = {
+	setting: p => http.get('blade-system/param/detail', {params:p}),
 	getPlatformParams: p => http.get('/app/platformsetting/getPlatformValueByList', {params:p}),
 }
 
@@ -101,5 +107,6 @@ export const api={
 	CMCC,
 	pointgoods,
 	order,
-	address
+	address,
+	notice
 }

pages.json

@@ -39,6 +39,14 @@
 				"navigationStyle": "custom"
 			}
 
+		}, {
+			"path": "pages/test/test",
+			"style": {
+				"navigationBarTitleText": "test",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
 		}, {
 			"path": "pages/activity/activityDetail",
 			"style": {
@@ -92,57 +100,81 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
-	    ,{
-            "path" : "pages/webview/createOrder",
-            "style" :
-            {
-                "navigationBarTitleText": "创建订单",
-                "enablePullDownRefresh": false
-            }
+		}, {
+			"path": "pages/webview/createOrder",
+			"style": {
+				"navigationBarTitleText": "创建订单",
+				"enablePullDownRefresh": false
+			}
 
-        }
-        ,{
-            "path" : "pages/mine/my-help/help-records",
-            "style" :
-            {
-                "navigationBarTitleText": "热力明细",
-                "enablePullDownRefresh": false
-            }
+		}, {
+			"path": "pages/mine/my-help/help-records",
+			"style": {
+				"navigationBarTitleText": "热力明细",
+				"enablePullDownRefresh": false
+			}
 
-        }
-        ,{
-            "path" : "pages/mine/my-product/my-product",
+		}, {
+			"path": "pages/mine/my-product/my-product",
+			"style": {
+				"navigationBarTitleText": "我的作品",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/webview/auth_result",
+			"style": {
+				"navigationBarTitleText": "授权结果",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/shop/detail",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/webview/point_rule",
+			"style": {
+				"navigationBarTitleText": "积分兑换规则",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	    ,{
+            "path" : "pages/introduce/notice",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "我的作品",
+                "navigationBarTitleText": "投票须知",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/webview/auth_result",
+            "path" : "pages/endorsement/endorsement",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "授权结果",
+                "navigationBarTitleText": "我要代言",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/shop/detail",
+            "path" : "pages/rule/rule",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "商品详情",
+                "navigationBarTitleText": "活动规则",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/webview/point_rule",
+            "path" : "pages/rule/point",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "积分兑换规则",
+                "navigationBarTitleText": "积分规则",
                 "enablePullDownRefresh": false
             }
             
@@ -181,4 +213,4 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
-}
+}

pages/activity/activityDetail.vue

@@ -2,7 +2,7 @@
 	<view :style="vuex_skin">
 		<u-navbar :custom-back="customBack" :is-back="true" title="作品详情"></u-navbar>
 		<view class="" v-show="!loading">
-			<video class="works-video" :autoplay="true" :src="activity.videoUrl"></video>
+			<video class="works-video"  :poster="activity.imgUrl" :src="activity.videoUrl"></video>
 			<view style="padding: 20rpx 30rpx 50rpx 30rpx;background: white;">
 				<view class="title" style="border-bottom: 1rpx solid #EEEEEE ;">
 					<span class="bg-red work-no"> {{activity.productNo}}号</span>
@@ -18,7 +18,7 @@
 				</view>
 			</view>
 
-			<view @click="showShare" class="bg-white padding-30 margin-top-30 flex">
+			<view @click="showShare" class="bg-white padding-30 margin-top-30 flex" v-if="false">
 				<view class="basis-xs">
 					<image style="width: 84rpx;height: 84rpx;" src="../../static/icon/ic_zhuanfa.png"></image>
 				</view>

pages/endorsement/endorsement.vue

@@ -0,0 +1,50 @@
+<template>
+	<view class="u-content">
+		<u-parse :html="content" v-show="!loading"></u-parse>
+		<loading ref="loading" type="3"/>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				loading:true,
+				content: ''
+			}
+		},
+		onLoad() {
+			this.$refs.loading.showLoading()
+			this.fetchDetail()
+		},
+		methods:{
+			fetchDetail(){
+				let params={
+					title:'我要代言'
+				}
+				this.$api.notice.detail(params).then(res=>{
+					this.content=res.data.data.content
+					this.hideLoading()
+				})
+			},
+			hideLoading(){
+				setTimeout(()=>{
+					this.$refs.loading.hide()
+					this.loading=false
+				},300)
+			}
+		}
+	}
+</script>
+
+<style >
+	page{
+		background-color: #FFFFFF;
+	}
+	
+	.u-content {
+		padding: 30rpx;
+		line-height: 50rpx;
+		color: #505050;
+	}
+</style>

pages/index/home.vue

@@ -6,8 +6,8 @@
 				<u-swiper :list="swiperList" border-radius="12" name="url" height="300"></u-swiper>
 			</view>
 			<view class="">
-				<view class="cu-list grid col-4 no-border" style="border-radius:20rpx ;">
-					<view class="cu-item" @click.stop="jump(item)" v-for="(item,index) in gridList" :key="index">
+				<view class="cu-list grid col-3 no-border"  style="border-radius:20rpx ;">
+					<view class="cu-item" @click.stop="jump(item)" v-for="(item,index) in gridList"  :key="index">
 						<view class="grid-icon">
 							<image style="width: 88rpx;height: 88rpx;" :src="item.icon" />
 						</view>
@@ -42,7 +42,7 @@
 						<text>3</text>
 					</view>
 					<view class="left">
-						<image :src="item.imgUrl" mode="aspectFill"></image>
+						<image :src="item.imgUrl" mode="aspectFill" ></image>
 					</view>
 					<view class="right" style="width: 100%;">
 						<view class="flex-direction flex">
@@ -121,21 +121,18 @@
 				//菜单
 				gridList: [{
 						icon: '/static/grid/jieshao.png',
-						name: "活动介绍",
-						path: "/pages/introduce/introduce"
+						name: "投票须知",
+						path: "/pages/introduce/notice",
 					}, {
 						icon: '/static/grid/baoming.png',
 						name: "我要代言",
+						path:'/pages/endorsement/endorsement'
 					},
 					{
 						icon: '/static/grid/rank.png',
 						name: "排行榜",
-						path: "/pages/rank/rank"
+						path: "/pages/rank/rank",
 					},
-					{
-						icon: '/static/grid/more.png',
-						name: "更多活动",
-					}
 				]
 			};
 		},
@@ -173,10 +170,6 @@
 					this.$refs.toast.info('暂无更多活动')
 					return
 				}
-				if (item.name=='我要代言') {
-					this.showPromotePoster()
-					return
-				}
 				uni.navigateTo({
 					url:item.path
 				})

pages/introduce/notice.vue

@@ -0,0 +1,50 @@
+<template>
+	<view class="u-content">
+		<u-parse :html="content" v-show="!loading"></u-parse>
+		<loading ref="loading" type="3"/>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				loading:true,
+				content: ''
+			}
+		},
+		onLoad() {
+			this.$refs.loading.showLoading()
+			this.fetchDetail()
+		},
+		methods:{
+			fetchDetail(){
+				let params={
+					title:'投票须知'
+				}
+				this.$api.notice.detail(params).then(res=>{
+					this.content=res.data.data.content
+					this.hideLoading()
+				})
+			},
+			hideLoading(){
+				setTimeout(()=>{
+					this.$refs.loading.hide()
+					this.loading=false
+				},300)
+			}
+		}
+	}
+</script>
+
+<style >
+	page{
+		background-color: #FFFFFF;
+	}
+	
+	.u-content {
+		padding: 30rpx;
+		line-height: 50rpx;
+		color: #505050;
+	}
+</style>

pages/mine/mine.vue

@@ -129,16 +129,10 @@
 						url: '/pages/shop/shop',
 						auth: false //是否登录验证
 					},
-					{
-						name: '更多活动',
-						icon: '/static/mine/huodong.png',
-						url: 'more',
-						auth: false //是否登录验证
-					},
 					{
 						name: '活动规则',
 						icon: '/static/mine/guize.png',
-						url: '/pages/webview/point_rule?url=https://vote.guosen-fumao.cn/point_rule.html',
+						url: '/pages/rule/rule',
 						auth: false
 					},
 					// {

pages/rule/point.vue

@@ -0,0 +1,49 @@
+<template>
+	<view class="u-content">
+		<u-parse :html="content" v-show="!loading"></u-parse>
+		<loading ref="loading" type="3"/>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				loading:true,
+				content: ''
+			}
+		},
+		onLoad() {
+			this.$refs.loading.showLoading()
+			this.fetchDetail()
+		},
+		methods:{
+			fetchDetail(){
+				let params={
+					title:'积分规则'
+				}
+				this.$api.notice.detail(params).then(res=>{
+					this.content=res.data.data.content
+					this.hideLoading()
+				})
+			},
+			hideLoading(){
+				setTimeout(()=>{
+					this.$refs.loading.hide()
+					this.loading=false
+				},300)
+			}
+		}
+	}
+</script>
+
+<style >
+	page{
+		background-color: #FFFFFF;
+	}
+	
+	.u-content {
+		padding: 30rpx;
+		line-height: 50rpx;
+	}
+</style>

pages/rule/rule.vue

@@ -0,0 +1,49 @@
+<template>
+	<view class="u-content">
+		<u-parse :html="content" v-show="!loading"></u-parse>
+		<loading ref="loading" type="3"/>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				loading:true,
+				content: ''
+			}
+		},
+		onLoad() {
+			this.$refs.loading.showLoading()
+			this.fetchDetail()
+		},
+		methods:{
+			fetchDetail(){
+				let params={
+					title:'活动规则'
+				}
+				this.$api.notice.detail(params).then(res=>{
+					this.content=res.data.data.content
+					this.hideLoading()
+				})
+			},
+			hideLoading(){
+				setTimeout(()=>{
+					this.$refs.loading.hide()
+					this.loading=false
+				},300)
+			}
+		}
+	}
+</script>
+
+<style >
+	page{
+		background-color: #FFFFFF;
+	}
+	
+	.u-content {
+		padding: 30rpx;
+		line-height: 50rpx;
+	}
+</style>

pages/shop/shop.vue

@@ -3,8 +3,7 @@
 		<u-navbar title-color="#fff" z-index="90" :border-bottom="false" :is-back="false" title="积分商城"
 			:background="{'backgroundColor': vuex_theme.shopBg}"></u-navbar>
 
-		<mescroll-body-diy ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback"
-			@up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 			<view class="bg-card">
 				<view class="info" style="display: flex;justify-content: space-between;">
 					<view class="flex" v-if="vuex_userId">
@@ -23,7 +22,7 @@
 						</view>
 					</view>
 					<view class="center" style="margin-right: -30rpx;">
-						<view class="cu-btn round sm rule" @click="$jump('/pages/webview/point_rule?url=https://vote.guosen-fumao.cn/point_rule.html')">
+						<view class="cu-btn round sm rule" @click="$jump('/pages/rule/point')">
 							积分规则
 						</view>
 					</view>
@@ -55,19 +54,15 @@
 					</navigator>
 				</view>
 			</view>
-		</mescroll-body-diy>
+		</mescroll-body>
 		<login ref="login" @signIn="signIn" @phoneSuccess="phoneSuccess"></login>
 	</view>
 </template>
 
 <script>
-	import MescrollBodyDiy from "@/uni_modules/mescroll-uni/components/mescroll-diy/xinlang/mescroll-body.vue";
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	export default {
 		mixins: [MescrollMixin],
-		components: {
-			MescrollBodyDiy,
-		},
 		data() {
 			return {
 				swiperList: [

pages/test/test.vue

@@ -1,40 +1,27 @@
 <template>
 	<view class="">
-		<text>123456</text>
-		<poster ref="poster"></poster>
-		<uqrcode class="canvas-hide" ref="uqrcode"></uqrcode>
+		
 	</view>
 </template>
 
 <script>
-	import poster from "@/components/poster/poster.vue"
-	import uqrcode from "@/components/uqrcode/uqrcode.vue"
-	export default {
-		components: {
-			poster,
-			uqrcode
-		},
-		data() {
-			return {
-
-			};
-		},
-		async onReady() {
-			let res=await this.$refs.uqrcode.make({size: 150,text: '黄明潘'})
-			this.$refs.poster.showCanvas(res.tempFilePath)
-		},
-		onLoad() {
+export default {
+	name: '',
+	data() {
+		return {
 			
+		};
+	},
+	onLoad() {
+		let setting={
+			'showShare':false,
+			'showMoreActive':false
 		}
-	};
+		console.log(JSON.stringify(setting));
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-    .canvas-hide {
-        position: fixed;
-        right: 100vw;
-        bottom: 100vh;
-        z-index: -9999;
-        opacity: 0;
-    }
-</style>
+	
+</style>