From ce9433b4e3f3afb0aa085f5e38d24507d5d2b065 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 29 Feb 2024 14:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=BF=E7=AD=96=E7=AD=94?=
 =?UTF-8?q?=E7=96=91,=E6=95=99=E5=AD=A6=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/app.js         |   4 +-
 manifest.json         |   4 +-
 pages.json            |  16 ++++++
 pages/index/index.vue |   3 +-
 pages/rich/mp4.vue    | 124 ++++++++++++++++++++++++++++++++++++++++
 pages/rich/rich.vue   | 129 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 274 insertions(+), 6 deletions(-)
 create mode 100644 pages/rich/mp4.vue
 create mode 100644 pages/rich/rich.vue

diff --git a/config/app.js b/config/app.js
index aed86ed..5d52a61 100644
--- a/config/app.js
+++ b/config/app.js
@@ -12,8 +12,8 @@ let httpApiSix
 let wsApi
 
 // 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
 // const env = 'prew'; // 预上线
 
 switch (env) {
diff --git a/manifest.json b/manifest.json
index 146049c..797c17b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.9.3",
-    "versionCode" : 193,
+    "versionName" : "1.9.4",
+    "versionCode" : 194,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 70a268c..774e89f 100644
--- a/pages.json
+++ b/pages.json
@@ -312,6 +312,22 @@
             "navigationStyle": "custom",
             "onReachBottomDistance": 300
           }
+        },
+        {
+          "path" : "pages/rich/rich",
+          "style" : 
+          {
+            "navigationBarTitleText" : "政策答疑",
+            "enablePullDownRefresh" : false
+          }
+        },
+        {
+          "path" : "pages/rich/mp4",
+          "style" : 
+          {
+            "navigationBarTitleText" : "教学视频",
+            "enablePullDownRefresh" : false
+          }
         }
     ],
 	"subPackages": [{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 08c3ffb..6b1f513 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -585,7 +585,6 @@ import activityCard from "@/components/activityCard.vue"
 
         } else {
           uni.navigateTo({
-
             url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
           })
         }
@@ -613,7 +612,7 @@ import activityCard from "@/components/activityCard.vue"
         // 	url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}&source=103&location=${this.latitude},${this.longitude}`
         // })
         uni.navigateTo({
-          url: `pages/cloud_warehouse/big_classification/index`
+          url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${this.street_id}&townName=${this.town}&source=103&location=${this.latitude},${this.longitude}`
         })
 
       },
diff --git a/pages/rich/mp4.vue b/pages/rich/mp4.vue
new file mode 100644
index 0000000..cb3c1ea
--- /dev/null
+++ b/pages/rich/mp4.vue
@@ -0,0 +1,124 @@
+<template>
+  <view class="box" style="position: relative;">
+    <view style="height: 30rpx;"></view>
+    <view class="">
+      <block v-for="(item, index) in list" :key="index">
+        <view class="card">
+          <view class="card-tit">
+            <view class="" style="font-size: 32rpx;display: flex;align-items: center;">
+              <view class="">
+                {{item.title}}
+              </view>
+            </view>
+            <view class="" style="display: flex;align-items: center;" @click='open(index)'>
+              展开
+              <u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png" width="24rpx"
+                height="24rpx" class='icon' :style=" {transform:isOpen[index]? 'rotate(180deg)' :'rotate(0)'} " />
+            </view>
+
+          </view>
+        </view>
+        <view class="card-content" :style="{height:isOpen[index]?'0':'auto',padding: isOpen[index]?'0':'20rpx'  } "
+          style="height: 0;padding: 0;">
+          <view id="formheight1">
+            <view class="content" v-if="!isOpen[index]" v-html="item.content.content"></view>
+          </view>
+        </view>
+      </block>
+      <u-empty :show="list.length == 0" mode="list" text="没有找到数据呢" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { getArticleList } from "@/api/api.js"
+  export default {
+    data() {
+      return {
+        isOpen: [],
+        list: [],
+      }
+    },
+    computed: {},
+    onReady() {},
+    onLoad() {
+      this.getArticleList();
+    },
+    methods: {
+      getArticleList() {
+        getArticleList(27).then(res => {
+          res.data.list.forEach(e => {
+            e.content.content = e.content.content.replace(/\<video /g, '<video style="width: 100%; background-color: #888888;" ');
+            this.isOpen.push(true);
+          })
+          this.list = res.data.list;
+        })
+      },
+      open(index) {
+        this.isOpen.forEach((item, i) => {
+          if (i == index) {
+            this.isOpen.splice(index, 1, this.isOpen[index] ? false : true);
+          } else {
+            this.isOpen.splice(i, 1, true);
+          }
+        })
+      },
+
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .box {
+    background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
+    min-height: 100vh;
+    font-size: 28rpx;
+    padding-bottom: 5vh;
+  }
+
+  .tit {
+    display: flex;
+    width: 638rpx;
+    margin: 230rpx auto 30rpx;
+    justify-content: space-between;
+    font-size: 28rpx;
+    color: #000;
+  }
+
+  .card {
+    width: 686rpx;
+    margin: 0 auto;
+    background-color: white;
+    padding: 30rpx;
+    border-radius: 20rpx;
+    position: relative;
+
+    .card-tit {
+      display: flex;
+      justify-content: space-between;
+    }
+
+  }
+
+  .card-content {
+    background-color: #FFE7B9;
+    border-radius: 20rpx;
+    padding: 20rpx;
+    overflow: hidden;
+    transition: 300ms;
+    width: 690rpx;
+    margin: 18rpx auto;
+
+    .content {
+      width: 100%;
+      height: auto;
+      overflow: hidden;
+      
+    }
+  }
+
+  .icon {
+    margin-left: 10rpx;
+    transform: translateY(2rpx);
+    transition: 300ms !important;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/rich/rich.vue b/pages/rich/rich.vue
new file mode 100644
index 0000000..dbb8644
--- /dev/null
+++ b/pages/rich/rich.vue
@@ -0,0 +1,129 @@
+<template>
+  <view class="box" style="position: relative;">
+    <view style="height: 30rpx;"></view>
+    <view class="">
+      <block v-for="(item, index) in list" :key="index">
+        <view class="card">
+          <view class="card-tit">
+            <view class="" style="font-size: 32rpx;display: flex;align-items: center;">
+              <view class="">
+                {{item.title}}
+              </view>
+            </view>
+            <view class="" style="display: flex;align-items: center;" @click='open(index)'>
+              展开
+              <u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png" width="24rpx"
+                height="24rpx" class='icon' :style=" {transform:isOpen[index]? 'rotate(180deg)' :'rotate(0)'} " />
+            </view>
+
+          </view>
+        </view>
+        <view class="card-content" :style="{height:isOpen[index]?'0':'auto',padding: isOpen[index]?'0':'20rpx'  } "
+          style="height: 0;padding: 0;">
+          <view id="formheight1">
+            <view class="content" v-if="!isOpen[index]" v-html="item.content.content"></view>
+          </view>
+        </view>
+      </block>
+      <u-empty :show="list.length == 0" mode="list" text="没有找到数据呢" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { getArticleList } from "@/api/api.js"
+  export default {
+    data() {
+      return {
+        isOpen: [],
+        list: [],
+      }
+    },
+    computed: {},
+    onReady() {},
+    onLoad() {
+      let user = this.$store.state.app.userInfo;
+      if (typeof user == 'string') user = JSON.parse(user);
+      this.getArticleList();
+    },
+    methods: {
+      getArticleList() {
+        getArticleList(26).then(res => {
+          res.data.list.forEach(e => {
+            e.content.content = e.content.content.replace(/\<video /g, '<video style="width: 100%; background-color: #888888;" ');
+            this.isOpen.push(true);
+          })
+          this.list = res.data.list;
+        })
+      },
+      back() {
+        uni.navigateBack();
+      },
+      open(index) {
+        this.isOpen.forEach((item, i) => {
+          if (i == index) {
+            this.isOpen.splice(index, 1, this.isOpen[index] ? false : true);
+          } else {
+            this.isOpen.splice(i, 1, true);
+          }
+        })
+      },
+
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .box {
+    background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
+    min-height: 100vh;
+    font-size: 28rpx;
+    padding-bottom: 5vh;
+  }
+
+  .tit {
+    display: flex;
+    width: 638rpx;
+    margin: 230rpx auto 30rpx;
+    justify-content: space-between;
+    font-size: 28rpx;
+    color: #000;
+  }
+
+  .card {
+    width: 686rpx;
+    margin: 0 auto;
+    background-color: white;
+    padding: 30rpx;
+    border-radius: 20rpx;
+    position: relative;
+
+    .card-tit {
+      display: flex;
+      justify-content: space-between;
+    }
+
+  }
+
+  .card-content {
+    background-color: #FFE7B9;
+    border-radius: 20rpx;
+    padding: 20rpx;
+    overflow: hidden;
+    transition: 300ms;
+    width: 690rpx;
+    margin: 18rpx auto;
+
+    .content {
+      width: 100%;
+      height: auto;
+      overflow: hidden;
+      
+    }
+  }
+
+  .icon {
+    margin-left: 10rpx;
+    transform: translateY(2rpx);
+    transition: 300ms !important;
+  }
+</style>
\ No newline at end of file