Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/duanju/video_app into test

pages/index/index.vue

@@ -197,6 +197,14 @@
 			style="width: 100%;height: 100%;position: fixed;top: 0;z-index: 999;background: url('../../static/images/index_guide.png') no-repeat center bottom / 100%;background-color: rgba(0, 0, 0, 0.8);">
 		</div>
 		<!-- #endif -->
+		<u-modal v-model="ruleShow" confirm-text="知道了" :title="rule_title" :title-style="{fontWeight:'700'}" confirm-color="rgb(255, 117, 129)">
+			<view class="u-p-30 u-text-left">
+				<scroll-view scroll-y="true" style="max-height: 50vh;" >
+					<rich-text class="color-666" :nodes="rule_content"></rich-text>
+				</scroll-view>
+			</view>
+			
+		</u-modal>
 	</view>
 </template>
 
@@ -269,6 +277,9 @@
 				isIos: true,
 				scrollTop: 0,
 				isShowMoneyPay: true,
+				ruleShow: true,
+				rule_title: '',
+				rule_content: '',
 			};
 		},
 		onShareAppMessage(res) {
@@ -416,6 +427,16 @@
 				}
 			});
 			// #endif
+			
+			httpsRequest.getT("app/announcement", {}).then(res => {
+				if (res.code == 0) {
+					if (res.data && res.data.state == 1) {
+						this.ruleShow = true
+						this.rule_title = res.data.title
+						this.rule_content = res.data.content
+					}
+				}
+			});
 
 		},
 		onReachBottom() {