Merge branch 'develop/3.1.2' into test

src/api/devices.js

@@ -0,0 +1,10 @@
+import request from "../utils/request";
+
+// 获取设备操作指南
+export function detail(data) {
+  return request({
+    url: `/device/getOperateGuide`,
+    method: 'get',
+    data
+  })
+}

src/api/guide.js

@@ -1,6 +1,6 @@
 import request from "../utils/request"
 
-export function getContent(data) {
+export function detail(data) {
   return request({
     url: `/device/getGuidePageContent`,
     method: 'get',

src/components/uv-parse/uv-parse.vue

@@ -484,7 +484,7 @@ export default {
 /* #ifndef APP-PLUS-NVUE */
 /* 根节点样式 */
 ._root {
-  padding: 1px 0;
+  /* padding: 1px 0; */
   overflow-x: auto;
   overflow-y: hidden;
   -webkit-overflow-scrolling: touch;

src/pages.json

@@ -11,6 +11,13 @@
 			}
 		},
 		{
+			//设备操控视频页
+			"path": "pages/devices/detail",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			// 设备文章
 			"path": "pages/article/index",
 			"style": {
@@ -30,15 +37,13 @@
 			"path": "pages/help/index",
 			"style": {
 				"navigationStyle": "custom",
-				"onReachBottomDistance": 50,
-				"navigationBarTitleText": "帮助与反馈"
+				"onReachBottomDistance": 50
 			}
 		},
 		{ // 我的反馈
 			"path": "pages/help/detail",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的反馈"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -49,27 +54,6 @@
 			}
 		},
 		{
-			// 关于我们
-			"path": "pages/about/index",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			// 用户协议
-			"path": "pages/user/agreement",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			// 隐私协议
-			"path": "pages/privacy/agreement",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
 			// 猫王博物馆
 			"path": "pages/museum/index",
 			"style": {
@@ -114,13 +98,6 @@
 			}
 		},
 		{
-			// vip音乐服务
-			"path": "pages/vip/index",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
 			// 抽奖
 			"path": "pages/lottery/index",
 			"style": {
@@ -142,27 +119,6 @@
 			}
 		},
 		{
-			// 爱听付费协议
-			"path": "pages/imusic/agreement",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			// 儿童隐私保护指南
-			"path": "pages/imusic/children",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			// 音乐服务许可协议
-			"path": "pages/imusic/service",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
 			// 后台运行保护协议
 			"path": "pages/backgrounder/index",
 			"style": {

src/pages/about/index.vue

@@ -1,22 +0,0 @@
-<template>
-  <view class="app-container">
-
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-
-    }
-  },
-  created(){
-    window.location.href = "https://ohplay.radio1964.net/about"
-  }
-}
-</script>
-
-<style lang="scss">
-
-</style>

src/pages/devices/detail.vue

@@ -0,0 +1,45 @@
+<template>
+  <view class="detail">
+    <uv-parse :content="content" :preview-img="false" />
+  </view>
+</template>
+
+<script>
+import { detail } from '@/api/devices'
+export default {
+  data() {
+    return {
+      content: ''
+    }
+  },
+  onLoad(e) {
+    this.getDetail(e)
+  },
+  methods: {
+    getDetail(e) {
+      detail(e).then(res => {
+        if (res.data.code === 0) {
+          this.content = res.data.data.content
+        } else {
+          uni.showToast({
+            title: res.data.message,
+            icon: 'error',
+            mask: true,
+            duration: 2000
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  white-space: pre-wrap;
+}
+
+::v-deep img {
+  display: block;
+}
+</style>

src/pages/guide/index.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { getContent } from '@/api/guide'
+import { detail } from '@/api/guide'
 export default {
   data() {
     return {
@@ -19,8 +19,12 @@ export default {
     }
   },
   onLoad(e) {
-    if (e.deviceModel) {
-      getContent({ clientType: e.deviceModel }).then(res => {
+    if (e) {
+      let data = {
+        clientType: e.deviceModel,
+        id: e.id
+      }
+      detail(data).then(res => {
         if (res.data.code === 0) {
           this.content = res.data.data.guidePageContent
         }
@@ -44,7 +48,7 @@ export default {
     overflow-y: scroll;
   }
 
-  .no-data{
+  .no-data {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -60,7 +64,7 @@ export default {
   }
 }
 
-img{
+img {
   width: 100%;
 }
 </style>

src/pages/imusic/index.vue

@@ -8,8 +8,8 @@
           <radio :value="value" />
         </radio-group>
         <text>购买即视为同意</text>
-        <navigator url="/pages/imusic/agreement">《场景歌单付费协议》</navigator>
-        <navigator url="/pages/imusic/service">《音乐服务许可协议》</navigator>
+        <navigator url="/pages/agreement/index?type=5">《场景歌单付费协议》</navigator>
+        <navigator url="/pages/agreement/index?type=2">《音乐服务许可协议》</navigator>
       </span>
     </view>
   </view>