.

android/app/src/main/java/com/izouma/jmrh/MainActivity.java

@@ -4,6 +4,7 @@ import android.os.Bundle;
 
 import com.getcapacitor.BridgeActivity;
 import com.getcapacitor.Plugin;
+import com.getcapacitor.community.keepawake.KeepAwake;
 
 import java.util.ArrayList;
 
@@ -16,6 +17,7 @@ public class MainActivity extends BridgeActivity {
     this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
       // Additional plugins you've installed go here
       // Ex: add(TotallyAwesomePlugin.class);
+      add(KeepAwake.class);
     }});
   }
 }

package.json

@@ -16,7 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "@capacitor-community/keep-awake": "^1.0.0",
-    "@capacitor/android": "2.4.6",
+    "@capacitor/android": "^2.4.6",
     "@capacitor/cli": "^2.4.6",
     "@capacitor/core": "^2.4.6",
     "@capacitor/ios": "2.4.6",

src/components/newsItem.vue

@@ -4,7 +4,7 @@
             <div class="title">{{ content.title }}</div>
             <div class="time">{{ content.createdAt }}</div>
         </div>
-        <div class="cover" v-if="content.cover" :style="{ backgroundImage: `url(${content.cover})` }"></div>
+        <img class="cover" v-if="content.cover" :src="content.cover" />
     </router-link>
 </template>
 <script>
@@ -47,8 +47,7 @@ export default {
         width: 110px;
         min-width: 110px;
         height: 66px;
-        background-size: cover;
-        background-position: center;
+        object-fit: cover;
         border-radius: 6px;
     }
 }

src/router.js

@@ -214,6 +214,14 @@ const router = new Router({
             meta: {
                 statusBar: 'dark'
             }
+        },
+        {
+            path: '/collections',
+            name: 'collections',
+            component: () => import(/* webpackChunkName: "collections" */ '@/views/collections.vue'),
+            meta: {
+                statusBar: 'dark'
+            }
         }
     ]
 });

src/views/collections.vue

@@ -0,0 +1,52 @@
+<template>
+    <div>
+        <nav-bar title="我的收藏" @click-left="$router.go(-1)">
+            <div slot="append">
+                <div class="tab-row">
+                    <van-tabs
+                        v-model="type"
+                        :color="$colors.prim"
+                        :title-active-color="$colors.prim"
+                        title-inactive-color="#000000"
+                    >
+                        <van-tab title="技术发布"></van-tab>
+                        <van-tab title="产品发布"></van-tab>
+                        <van-tab title="资源共享"></van-tab>
+                        <van-tab title="技术需求"></van-tab>
+                        <van-tab title="产品需求"></van-tab>
+                        <van-tab title="融资需求"></van-tab>
+                    </van-tabs>
+                </div>
+                <div class="filter-row"></div>
+            </div>
+        </nav-bar>
+        <div class="list">
+            <van-swipe-cell>
+                <img src="https://jxjmrh.oss-cn-hangzhou.aliyuncs.com/image/2021-01-13-10-45-33OJgpJjKU.png" />
+                <template #right>
+                    <van-button square text="删除" type="danger" class="delete-button" />
+                </template>
+            </van-swipe-cell>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            type: 0
+        };
+    }
+};
+</script>
+<style lang="less" scoped>
+/deep/ .van-tabs__line {
+    bottom: 23px;
+}
+/deep/ .van-tab__text {
+    padding-bottom: 1.5px;
+}
+/deep/ .van-tab--active .van-tab__text {
+    transform: scale(1.28);
+}
+</style>

src/views/index/interact.vue

@@ -16,6 +16,29 @@
             </transition>
         </div>
         <router-view></router-view>
+        <van-popup v-model="showNotice" class="popup-notice" position="bottom" @close="onCloseNotice">
+            <div class="title">
+                <div class="back" @click="showNotice = false">
+                    <img src="../../assets/nav_icon_back_black.png" />
+                </div>
+                发布须知
+            </div>
+            <div class="content">
+                1、请您自觉遵守中华人民共和国宪法和法律；<br />
+                2、您应对来信内容的真实性、客观性负责，信中不要含有猥亵、色情、造谣诽谤、人身攻击和反政府言论。否则，您将承担由此而引发的一切法律责任；<br />
+                3、不得发表未经证实的消息，亲身经历请注明；<br />
+                4、请勿发表与军民融合无关的留言，以及任何形式的广告和推介企业产品或服务等内容；<br />
+                5、请您真实、准确地填写您联系方式的信息，以便与您联系，我们将依法保护您的隐私权，保守您的联系方式等信息秘密；<br />
+                6、您联系方式的信息如不真实、不准确，留言将可予以删除；<br />
+                7、本平台拥有发布、编辑、删除网上留言的权利，凡不符合本须知规定的留言将予以删除；<br />
+                8、如在本平台留言，即表明已阅读并接受了上述各项条款。
+            </div>
+            <div class="btn-wrapper">
+                <div class="btn-lg" @click="agree">
+                    我已知晓且同意须知相关内容
+                </div>
+            </div>
+        </van-popup>
     </div>
 </template>
 <script>
@@ -24,7 +47,10 @@ export default {
         return {
             navTheme: 'light',
             navTransparent: true,
-            tab: 0
+            tab: 0,
+            showNotice: false,
+            resolveNotice: null,
+            rejectNotice: null
         };
     },
     created() {
@@ -89,6 +115,24 @@ export default {
                     this.tab = index;
                 }
             });
+        },
+        showNoticeDialog() {
+            return new Promise((resolve, reject) => {
+                this.showNotice = true;
+                this.resolveNotice = resolve;
+                this.rejectNotice = reject;
+            });
+        },
+        agree() {
+            if (this.resolveNotice) {
+                this.resolveNotice();
+            }
+            this.showNotice = false;
+        },
+        onCloseNotice() {
+            if (this.rejectNotice) {
+                this.rejectNotice();
+            }
         }
     }
 };
@@ -136,4 +180,51 @@ export default {
         left: 0;
     }
 }
+.popup-notice {
+    .flex-col();
+    .title {
+        height: 65px;
+        .flex();
+        justify-content: center;
+        font-size: 16px;
+        color: black;
+        font-weight: bold;
+        position: relative;
+        .back {
+            position: absolute;
+            left: 0;
+            top: 0;
+            height: 100%;
+            padding: 0 16px;
+            .flex();
+            justify-content: center;
+            img {
+                width: 24px;
+                height: 24px;
+            }
+        }
+        &::after {
+            .setBottomLine();
+            left: 16px;
+            right: 16px;
+        }
+    }
+    .content {
+        padding: 10px 16px;
+        font-size: 14px;
+        color: black;
+        line-height: 26px;
+        position: relative;
+        &::after {
+            .setBottomLine();
+            left: 16px;
+            right: 16px;
+        }
+    }
+    .btn-wrapper {
+        padding: 10px 0 calc(6px + var(--safe-bottom)) 0;
+        .flex();
+        justify-content: center;
+    }
+}
 </style>

src/views/index/my.vue

@@ -4,22 +4,19 @@
             <div class="bg"></div>
         </div>
         <div class="user">
-            <div
+            <img
                 class="avatar"
-                :style="{
-                    backgroundImage: `url(${(userInfo || {}).avatar ||
-                        'https://jxjmrh.oss-cn-hangzhou.aliyuncs.com/image/avatar.jpg'})`
-                }"
-            ></div>
+                :src="(userInfo || {}).avatar || 'https://jxjmrh.oss-cn-hangzhou.aliyuncs.com/image/avatar.jpg'"
+            />
             <div class="name" v-if="userInfo && userInfo.id">{{ userInfo.nickname }}</div>
             <router-link tag="div" to="/login" class="btn-login" v-else>登录</router-link>
         </div>
         <div class="menus">
-            <div class="item">
+            <router-link class="item" to="/collections">
                 <img src="../../assets/my_menu_icon_1.png" class="icon" />
                 <div class="text">我的收藏</div>
                 <img src="../../assets/icon_into.png" class="into" />
-            </div>
+            </router-link>
             <div class="item">
                 <img src="../../assets/my_menu_icon_2.png" class="icon" />
                 <div class="text">我的互动</div>
@@ -81,10 +78,10 @@ export default {
     .avatar {
         width: 90px;
         height: 90px;
-        background-size: cover;
-        background-position: center;
+        object-fit: cover;
         border-radius: 50%;
         border: 6px solid #ffffff;
+        background: white;
     }
     .name {
         font-size: 22px;

src/views/interact/createInteract.vue

@@ -10,9 +10,9 @@
             <textarea placeholder="详细描述您的问题" v-model="form.content"></textarea>
         </div>
         <div class="upload">
-            <van-uploader v-model="fileList" accept="image/*" multiple :after-read="afterRead" max-count="9" />
+            <van-uploader v-model="fileList" accept="image/*" multiple :after-read="afterRead" max-count="6" />
         </div>
-        <div class="switch-wrapper">
+        <div class="switch-wrapper" v-if="type === 'official'">
             <div class="label">是否公开</div>
             <van-switch v-model="pub" active-color="#BF1616" />
         </div>

src/views/interact/forum.vue

@@ -1,6 +1,11 @@
 <template>
     <div>
-        <div class="item" v-for="(n, index) in 20" :key="index" @click="$router.push({ name: 'forumDetail' })">
+        <div
+            class="item"
+            v-for="(n, index) in 20"
+            :key="index"
+            @click="$router.push({ name: 'forumDetail', query: { type: 'forum' } })"
+        >
             <div class="title">
                 <div class="tag hot"></div>
                 <div class="txt">
@@ -25,7 +30,7 @@
                 </div>
             </div>
         </div>
-        <div class="btn-fixed btn-edit">
+        <div class="btn-fixed btn-edit" @click="create">
             <img src="../../assets/icon_edit.png" class="icon" />
         </div>
     </div>
@@ -34,6 +39,13 @@
 export default {
     data() {
         return {};
+    },
+    methods: {
+        create() {
+            this.$parent.showNoticeDialog().then(() => {
+                this.$router.push({ name: 'createInteract', query: { type: 'forum' } });
+            });
+        }
     }
 };
 </script>

src/views/interact/forumDetail.vue

@@ -57,24 +57,27 @@
                     56
                 </div>
                 <div class="btn">
-                    <img src="../../assets/interact_icon_unlike.png" />
+                    <img src="../../assets/interact_icon_dislike.png" />
                     56
                 </div>
             </div>
         </div>
         <div class="btn-wrapper">
             <div class="btn-lg btn-comment" @click="showCommentDialog = true">
-                <img src="../../assets/icon_edit.png" />发表看法
+                <img src="../../assets/icon_edit.png" />{{ type === 'forum' ? '发表看法' : '回答' }}
             </div>
         </div>
 
         <van-popup v-model="showCommentDialog" position="bottom" class="comment-dialog">
             <div class="title">
-                回答
-                <div class="btn btn-cancel">取消</div>
+                {{ type === 'forum' ? '发表看法' : '回答' }}
+                <div class="btn btn-cancel" @click="showCommentDialog = false">取消</div>
                 <div class="btn btn-submit">提交</div>
             </div>
             <textarea placeholder="输入您的回答"></textarea>
+            <div class="upload">
+                <van-uploader v-model="fileList" accept="image/*" multiple :after-read="afterRead" max-count="6" />
+            </div>
         </van-popup>
     </div>
 </template>
@@ -85,6 +88,7 @@ import probe from 'probe-image-size';
 export default {
     data() {
         return {
+            type: 'forum',
             images: [
                 'http://www.ikanins.com/wp-content/uploads/2021/02/www.ikanins.com-20210221-93p-77.jpg',
                 'http://www.ikanins.com/wp-content/uploads/2021/02/www.ikanins.com-20210221-93p-2.jpg',
@@ -92,11 +96,37 @@ export default {
                 'http://www.ikanins.com/wp-content/uploads/2021/02/www.ikanins.com-20210221-93p-9.jpg',
                 'http://www.ikanins.com/wp-content/uploads/2021/02/www.ikanins.com-20210221-93p-12.jpg'
             ],
-            showCommentDialog: true
+            showCommentDialog: false,
+            fileList: []
         };
     },
-    created() {},
-    methods: {}
+    created() {
+        this.type = this.$route.query.type;
+    },
+    activated() {
+        this.type = this.$route.query.type;
+    },
+    methods: {
+        afterRead(file) {
+            console.log(file);
+            file.status = 'uploading';
+            file.message = '上传中...';
+            let form = new FormData();
+            form.append('file', file.file);
+            this.$http
+                .post('/upload/file', form)
+                .then(res => {
+                    console.log(res);
+                    file.status = 'success';
+                    file.url = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    file.status = 'failed';
+                    file.message = '上传失败';
+                });
+        }
+    }
 };
 </script>
 <style lang="less" scoped>
@@ -259,5 +289,22 @@ export default {
             color: @text4;
         }
     }
+    .upload {
+        padding: 16px;
+    }
+    /deep/ .van-uploader__preview-image {
+        width: 70px;
+        height: 70px;
+    }
+    /deep/ .van-uploader__upload {
+        width: 70px;
+        height: 70px;
+        &::after {
+            content: '添加图片';
+            font-size: 12px;
+            color: @text4;
+            margin-top: 4px;
+        }
+    }
 }
 </style>

src/views/interact/official.vue

@@ -28,7 +28,7 @@
         <div class="btn-fixed btn-call" @click="showCall = true">
             <img src="../../assets/icon_call.png" class="icon" />
         </div>
-        <div class="btn-fixed btn-edit" @click="showNotice = true">
+        <div class="btn-fixed btn-edit" @click="create">
             <img src="../../assets/icon_edit.png" class="icon" />
         </div>
 
@@ -51,39 +51,21 @@
 
             <div class="btn-lg">拨打电话咨询</div>
         </van-popup>
-
-        <van-popup v-model="showNotice" class="popup-notice" position="bottom">
-            <div class="title">
-                <div class="back" @click="showNotice = false">
-                    <img src="../../assets/nav_icon_back_black.png" />
-                </div>
-                发布须知
-            </div>
-            <div class="content">
-                1、请您自觉遵守中华人民共和国宪法和法律；<br />
-                2、您应对来信内容的真实性、客观性负责，信中不要含有猥亵、色情、造谣诽谤、人身攻击和反政府言论。否则，您将承担由此而引发的一切法律责任；<br />
-                3、不得发表未经证实的消息，亲身经历请注明；<br />
-                4、请勿发表与军民融合无关的留言，以及任何形式的广告和推介企业产品或服务等内容；<br />
-                5、请您真实、准确地填写您联系方式的信息，以便与您联系，我们将依法保护您的隐私权，保守您的联系方式等信息秘密；<br />
-                6、您联系方式的信息如不真实、不准确，留言将可予以删除；<br />
-                7、本平台拥有发布、编辑、删除网上留言的权利，凡不符合本须知规定的留言将予以删除；<br />
-                8、如在本平台留言，即表明已阅读并接受了上述各项条款。
-            </div>
-            <div class="btn-wrapper">
-                <div class="btn-lg" @click="$router.push({ name: 'createInteract', query: { type: 'official' } })">
-                    我已知晓且同意须知相关内容
-                </div>
-            </div>
-        </van-popup>
     </div>
 </template>
 <script>
 export default {
     data() {
         return {
-            showCall: false,
-            showNotice: false
+            showCall: false
         };
+    },
+    methods: {
+        create() {
+            this.$parent.showNoticeDialog().then(() => {
+                this.$router.push({ name: 'createInteract', query: { type: 'official' } });
+            });
+        }
     }
 };
 </script>
@@ -210,51 +192,4 @@ export default {
         width: 230px;
     }
 }
-.popup-notice {
-    .flex-col();
-    .title {
-        height: 65px;
-        .flex();
-        justify-content: center;
-        font-size: 16px;
-        color: black;
-        font-weight: bold;
-        position: relative;
-        .back {
-            position: absolute;
-            left: 0;
-            top: 0;
-            height: 100%;
-            padding: 0 16px;
-            .flex();
-            justify-content: center;
-            img {
-                width: 24px;
-                height: 24px;
-            }
-        }
-        &::after {
-            .setBottomLine();
-            left: 16px;
-            right: 16px;
-        }
-    }
-    .content {
-        padding: 10px 16px;
-        font-size: 14px;
-        color: black;
-        line-height: 26px;
-        position: relative;
-        &::after {
-            .setBottomLine();
-            left: 16px;
-            right: 16px;
-        }
-    }
-    .btn-wrapper {
-        padding: 10px 0 calc(6px + var(--safe-bottom)) 0;
-        .flex();
-        justify-content: center;
-    }
-}
 </style>

src/views/interact/qa.vue

@@ -1,6 +1,11 @@
 <template>
     <div>
-        <div class="item" v-for="(item, index) in 20" :key="index" @click="$router.push({ name: 'qaDetail' })">
+        <div
+            class="item"
+            v-for="(item, index) in 20"
+            :key="index"
+            @click="$router.push({ name: 'forumDetail', query: { type: 'qa' } })"
+        >
             <div class="title">人类未来如何逆转全球变暖？人类未来如何逆转全球变暖？人类未来如何逆转全球变暖？</div>
             <div class="info">
                 <van-image
@@ -16,7 +21,7 @@
                 <div class="num">5 回答</div>
             </div>
         </div>
-        <div class="btn-fixed btn-edit">
+        <div class="btn-fixed btn-edit" @click="create">
             <img src="../../assets/icon_edit.png" class="icon" />
         </div>
     </div>
@@ -25,6 +30,13 @@
 export default {
     data() {
         return {};
+    },
+    methods: {
+        create() {
+            this.$parent.showNoticeDialog().then(() => {
+                this.$router.push({ name: 'createInteract', query: { type: 'qa' } });
+            });
+        }
     }
 };
 </script>

src/views/snd/dFinancial.vue

@@ -29,7 +29,7 @@
             <van-empty v-if="empty" description="暂无内容" />
             <van-list v-else v-model="loading" :finished="last" finished-text="没有更多了" @load="loadmore">
                 <div class="list-item" v-for="item in list" :key="item.id" @click="detail(item.id, 'dFinancial')">
-                    <div v-if="item.pic" class="cover" :style="{ backgroundImage: `url(${item.pic})` }"></div>
+                    <img v-if="item.pic" class="cover" :src="item.pic" />
                     <div class="info">
                         <div class="name">{{ item.name }}</div>
                         <div class="desc">

src/views/snd/dProduct.vue

@@ -29,7 +29,7 @@
             <van-empty v-if="empty" description="暂无内容" />
             <van-list v-else v-model="loading" :finished="last" finished-text="没有更多了" @load="loadmore">
                 <div class="list-item" v-for="item in list" :key="item.id" @click="detail(item.id, 'dProduct')">
-                    <div v-if="item.pic" class="cover" :style="{ backgroundImage: `url(${item.pic})` }"></div>
+                    <img v-if="item.pic" class="cover" :src="item.pic" />
                     <div class="info">
                         <div class="name">{{ item.name }}</div>
                         <div class="desc">{{ item.needInfo }}</div>

src/views/snd/dTech.vue

@@ -29,7 +29,7 @@
             <van-empty v-if="empty" description="暂无内容" />
             <van-list v-else v-model="loading" :finished="last" finished-text="没有更多了" @load="loadmore">
                 <div class="list-item" v-for="item in list" :key="item.id" @click="detail(item.id, 'dTech')">
-                    <div v-if="item.pic" class="cover" :style="{ backgroundImage: `url(${item.pic})` }"></div>
+                    <img v-if="item.pic" class="cover" :src="item.pic" />
                     <div class="info">
                         <div class="name">{{ item.name }}</div>
                         <div class="desc">{{ item.needInfo }}</div>

src/views/snd/sProduct.vue

@@ -29,11 +29,7 @@
             <van-empty v-if="empty" description="暂无内容" />
             <van-list v-else v-model="loading" :finished="last" finished-text="没有更多了" @load="loadmore">
                 <div class="list-item" v-for="item in list" :key="item.id" @click="detail(item.id, 'sProduct')">
-                    <div
-                        v-if="item.picList && item.picList.length"
-                        class="cover"
-                        :style="{ backgroundImage: `url(${item.picList[0].url})` }"
-                    ></div>
+                    <img v-if="item.picList && item.picList.length" class="cover" :src="item.picList[0].url" />
                     <div class="info">
                         <div class="name">{{ item.name }}</div>
                         <div class="desc">{{ item.description }}</div>

src/views/snd/sResource.vue

@@ -29,11 +29,7 @@
             <van-empty v-if="empty" description="暂无内容" />
             <van-list v-else v-model="loading" :finished="last" finished-text="没有更多了" @load="loadmore">
                 <div class="list-item" v-for="item in list" :key="item.id" @click="detail(item.id, 'sResource')">
-                    <div
-                        v-if="item.picList && item.picList.length"
-                        class="cover"
-                        :style="{ backgroundImage: `url(${item.picList[0].url})` }"
-                    ></div>
+                    <img v-if="item.picList && item.picList.length" class="cover" :src="item.picList[0].url" />
                     <div class="info">
                         <div class="name">{{ item.name }}</div>
                         <div class="desc">{{ item.description }}</div>

src/views/snd/sTech.vue

@@ -29,11 +29,7 @@
             <van-empty v-if="empty" description="暂无内容" />
             <van-list v-else v-model="loading" :finished="last" finished-text="没有更多了" @load="loadmore">
                 <div class="list-item" v-for="item in list" :key="item.id" @click="detail(item.id, 'sTech')">
-                    <div
-                        v-if="item.picList && item.picList.length"
-                        class="cover"
-                        :style="{ backgroundImage: `url(${item.picList[0].url})` }"
-                    ></div>
+                    <img v-if="item.picList && item.picList.length" class="cover" :src="item.picList[0].url" />
                     <div class="info">
                         <div class="name">{{ item.name }}</div>
                         <div class="desc">{{ item.description }}</div>

src/views/snd/sndDetail.vue

@@ -32,7 +32,7 @@
         </div>
         <div class="desc" v-if="detail.needInfo || detail.description">{{ detail.needInfo || detail.description }}</div>
         <div class="org" v-if="detail.orgInfo">
-            <div class="logo" :style="{ backgroundImage: `url(${detail.orgInfo.logo || detail.orgInfo.loge})` }"></div>
+            <img class="logo" :src="detail.orgInfo.logo || detail.orgInfo.loge" />
             <div class="info">
                 <div class="org-name">
                     {{ detail.orgInfo.orgName }}<img src="../../assets/icon_org.png" class="icon-org" />
@@ -215,8 +215,7 @@ export default {
     .logo {
         width: 70px;
         height: 70px;
-        background-position: center;
-        background-size: cover;
+        object-fit: cover;
     }
     .info {
         .flex-col();

src/views/snd/subSnd.less

@@ -90,8 +90,7 @@
     .cover {
         width: 110px;
         height: 110px;
-        background-position: center;
-        background-size: cover;
+        object-fit: cover;
         min-width: 110px;
     }
     .info {

yarn.lock

@@ -661,7 +661,7 @@
   resolved "https://registry.yarnpkg.com/@capacitor-community/keep-awake/-/keep-awake-1.0.0.tgz#f570e9395f056a546facbadaa592a71a2619d68a"
   integrity sha512-4CMFpkLRnnQKBk4i0yz9gGAC48XgCqUtSG96g+miCVUzoPhzO4LcrFa5FcNLUahHkcCiaICyf1tnAr6k1cpc5g==
 
-"@capacitor/android@2.4.6":
+"@capacitor/android@^2.4.6":
   version "2.4.6"
   resolved "https://registry.yarnpkg.com/@capacitor/android/-/android-2.4.6.tgz#57c65f67d6a4e6b67f7f0f7fd23fa4c3c324ecc2"
   integrity sha512-SBXO0eVtkssnq1gfs6n/8vJLJXPjzqbIblhPetMiR0Myvjt9eqB7v5HbQ4t1EW0+jV46UGyFV6CPCrZeKPtvXg==